diff options
| author | 2021-01-25 17:20:29 +0000 | |
|---|---|---|
| committer | 2021-01-25 17:20:29 +0000 | |
| commit | bd8cffcd86430b40f026f656c45336644b826f4b (patch) | |
| tree | 8d1f5713fcaa6294252f242ad8e03db962f26548 | |
| parent | 61bb2cfccc58abd6dcd05fbd5a4073cf8b27ef40 (diff) | |
| parent | f068636d2c8ea9a043f04f46fdd3a480bc575b8d (diff) | |
Merge "Revert "Replace Context#sendStickyBroadcastAsUser()""
| -rw-r--r-- | services/core/java/com/android/server/ConnectivityService.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 9aadcf837eb8..b6232a0661ff 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -325,8 +325,6 @@ public class ConnectivityService extends IConnectivityManager.Stub private boolean mRestrictBackground; private final Context mContext; - // The Context is created for UserHandle.ALL. - private final Context mUserAllContext; private final Dependencies mDeps; // 0 is full bad, 100 is full good private int mDefaultInetConditionPublished = 0; @@ -1162,8 +1160,8 @@ public class ConnectivityService extends IConnectivityManager.Stub intentFilter.addAction(Intent.ACTION_USER_REMOVED); intentFilter.addAction(Intent.ACTION_USER_UNLOCKED); - mUserAllContext = mContext.createContextAsUser(UserHandle.ALL, 0 /* flags */); - mUserAllContext.registerReceiver( + final Context userAllContext = mContext.createContextAsUser(UserHandle.ALL, 0 /* flags */); + userAllContext.registerReceiver( mIntentReceiver, intentFilter, null /* broadcastPermission */, @@ -1179,7 +1177,7 @@ public class ConnectivityService extends IConnectivityManager.Stub intentFilter.addAction(Intent.ACTION_PACKAGE_REPLACED); intentFilter.addAction(Intent.ACTION_PACKAGE_REMOVED); intentFilter.addDataScheme("package"); - mUserAllContext.registerReceiver( + userAllContext.registerReceiver( mIntentReceiver, intentFilter, null /* broadcastPermission */, @@ -1188,7 +1186,7 @@ public class ConnectivityService extends IConnectivityManager.Stub // Listen to lockdown VPN reset. intentFilter = new IntentFilter(); intentFilter.addAction(LockdownVpnTracker.ACTION_LOCKDOWN_RESET); - mUserAllContext.registerReceiver( + userAllContext.registerReceiver( mIntentReceiver, intentFilter, NETWORK_STACK, mHandler); mNetworkActivityTracker = new LegacyNetworkActivityTracker(mContext, mNMS); @@ -2352,7 +2350,7 @@ public class ConnectivityService extends IConnectivityManager.Stub intent.addFlags(Intent.FLAG_RECEIVER_VISIBLE_TO_INSTANT_APPS); } try { - mUserAllContext.sendStickyBroadcast(intent, options); + mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL, options); } finally { Binder.restoreCallingIdentity(ident); } |