Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c8b4a02 authored by Will Osborn's avatar Will Osborn Committed by Automerger Merge Worker
Browse files

Merge "Revert "Replace Context#sendStickyBroadcastAsUser()"" am: bd8cffcd... 

Merge "Revert "Replace Context#sendStickyBroadcastAsUser()"" am: bd8cffcd am: e34f417d am: b64eb0fc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e347ed000fcec2a67047211fad81cae12de054c
parents 26432827 b64eb0fc

services/core/java/com/android/server/ConnectivityService.java

+5 −7
Original line number Diff line number Diff line
@@ -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);

            }