joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Revert^2 "Replace Context#sendStickyBroadcastAsUser()"" am: d07d47e255

Browse source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556143

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0bd4c977d13d2328cab480ca27c59de6fc4856a6
This commit is contained in:
Paul Hu 2021-01-27 00:33:36 +00:00 • committed by Automerger Merge Worker
commit c8341e807d
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
services/core/java/com/android/server/ConnectivityService.java
View file

@ -325,6 +325,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
private boolean mRestrictBackground; private boolean mRestrictBackground;
private final Context mContext; private final Context mContext;
// The Context is created for UserHandle.ALL.
private final Context mUserAllContext;
private final Dependencies mDeps; private final Dependencies mDeps;
// 0 is full bad, 100 is full good // 0 is full bad, 100 is full good
private int mDefaultInetConditionPublished = 0; private int mDefaultInetConditionPublished = 0;
@ -1160,8 +1162,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
intentFilter.addAction(Intent.ACTION_USER_REMOVED); intentFilter.addAction(Intent.ACTION_USER_REMOVED);
intentFilter.addAction(Intent.ACTION_USER_UNLOCKED); intentFilter.addAction(Intent.ACTION_USER_UNLOCKED);
final Context userAllContext = mContext.createContextAsUser(UserHandle.ALL, 0 /* flags */); mUserAllContext = mContext.createContextAsUser(UserHandle.ALL, 0 /* flags */);
userAllContext.registerReceiver( mUserAllContext.registerReceiver(
mIntentReceiver, mIntentReceiver,
intentFilter, intentFilter,
null /* broadcastPermission */, null /* broadcastPermission */,
@ -1177,7 +1179,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
intentFilter.addAction(Intent.ACTION_PACKAGE_REPLACED); intentFilter.addAction(Intent.ACTION_PACKAGE_REPLACED);
intentFilter.addAction(Intent.ACTION_PACKAGE_REMOVED); intentFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);
intentFilter.addDataScheme("package"); intentFilter.addDataScheme("package");
userAllContext.registerReceiver( mUserAllContext.registerReceiver(
mIntentReceiver, mIntentReceiver,
intentFilter, intentFilter,
null /* broadcastPermission */, null /* broadcastPermission */,
@ -1186,7 +1188,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
// Listen to lockdown VPN reset. // Listen to lockdown VPN reset.
intentFilter = new IntentFilter(); intentFilter = new IntentFilter();
intentFilter.addAction(LockdownVpnTracker.ACTION_LOCKDOWN_RESET); intentFilter.addAction(LockdownVpnTracker.ACTION_LOCKDOWN_RESET);
userAllContext.registerReceiver( mUserAllContext.registerReceiver(
mIntentReceiver, intentFilter, NETWORK_STACK, mHandler); mIntentReceiver, intentFilter, NETWORK_STACK, mHandler);
mNetworkActivityTracker = new LegacyNetworkActivityTracker(mContext, mNMS); mNetworkActivityTracker = new LegacyNetworkActivityTracker(mContext, mNMS);
@ -2350,7 +2352,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
intent.addFlags(Intent.FLAG_RECEIVER_VISIBLE_TO_INSTANT_APPS); intent.addFlags(Intent.FLAG_RECEIVER_VISIBLE_TO_INSTANT_APPS);
} }
try { try {
mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL, options); mUserAllContext.sendStickyBroadcast(intent, options);
} finally { } finally {
Binder.restoreCallingIdentity(ident); Binder.restoreCallingIdentity(ident);
} }