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

Commit a93acd12 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Register package broadcast receivers for all users." into rvc-dev am: 616f0731 

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

Change-Id: Ie13ed658a15494c8c46612fc6f5fac1be74c1287
parents 4e3b9473 616f0731

services/core/java/com/android/server/appop/AppOpsService.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -1597,7 +1597,8 @@ public class AppOpsService extends IAppOpsService.Stub { 
        packageUpdateFilter.addAction(Intent.ACTION_PACKAGE_REPLACED);

        packageUpdateFilter.addAction(Intent.ACTION_PACKAGE_REPLACED);

        packageUpdateFilter.addDataScheme("package");

        packageUpdateFilter.addDataScheme("package");





        mContext.registerReceiver(mOnPackageUpdatedReceiver, packageUpdateFilter);

        mContext.registerReceiverAsUser(mOnPackageUpdatedReceiver, UserHandle.ALL,

                packageUpdateFilter, null, null);





        synchronized (this) {

        synchronized (this) {

            for (int uidNum = mUidStates.size() - 1; uidNum >= 0; uidNum--) {

            for (int uidNum = mUidStates.size() - 1; uidNum >= 0; uidNum--) {
@@ -1640,7 +1641,7 @@ public class AppOpsService extends IAppOpsService.Stub { 
        final IntentFilter packageSuspendFilter = new IntentFilter();

        final IntentFilter packageSuspendFilter = new IntentFilter();

        packageSuspendFilter.addAction(Intent.ACTION_PACKAGES_UNSUSPENDED);

        packageSuspendFilter.addAction(Intent.ACTION_PACKAGES_UNSUSPENDED);

        packageSuspendFilter.addAction(Intent.ACTION_PACKAGES_SUSPENDED);

        packageSuspendFilter.addAction(Intent.ACTION_PACKAGES_SUSPENDED);

        mContext.registerReceiver(new BroadcastReceiver() {

        mContext.registerReceiverAsUser(new BroadcastReceiver() {

            @Override

            @Override

            public void onReceive(Context context, Intent intent) {

            public void onReceive(Context context, Intent intent) {

                final int[] changedUids = intent.getIntArrayExtra(Intent.EXTRA_CHANGED_UID_LIST);

                final int[] changedUids = intent.getIntArrayExtra(Intent.EXTRA_CHANGED_UID_LIST);
@@ -1664,7 +1665,7 @@ public class AppOpsService extends IAppOpsService.Stub { 
                    }

                    }

                }

                }

            }

            }

        }, packageSuspendFilter);

        }, UserHandle.ALL, packageSuspendFilter, null, null);





        final IntentFilter packageAddedFilter = new IntentFilter();

        final IntentFilter packageAddedFilter = new IntentFilter();

        packageAddedFilter.addAction(Intent.ACTION_PACKAGE_ADDED);

        packageAddedFilter.addAction(Intent.ACTION_PACKAGE_ADDED);