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

Commit 825c8d95 authored by Evan Severson's avatar Evan Severson
Browse files

Switch to using PackageManagerInternal api for pkg added/removed 

These are faster and should be more reliable than using the broadcast.

Test: atest CtsAppOpsTestCases
Bug: 268695406
Change-Id: Id602b45e5f340aeddda012931effd0a70a4535a2
parent 36f23d62

services/core/java/com/android/server/am/ActivityManagerService.java

+0 −3
Original line number Diff line number Diff line
@@ -14703,9 +14703,6 @@ public class ActivityManagerService extends IActivityManager.Stub 
                                    sendPackageBroadcastLocked(cmd,

                                            new String[] {ssp}, userId);

                                    if (fullUninstall) {

                                        mAppOpsService.packageRemoved(

                                                intent.getIntExtra(Intent.EXTRA_UID, -1), ssp);















                                        // Remove all permissions granted from/to this package















                                        mUgmInternal.removeUriPermissionsForPackage(ssp, userId,















                                                true, false);

























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



+74
−61




























Original line number
Diff line number
Diff line








@@ -1041,16 +1041,6 @@ public class AppOpsService extends IAppOpsService.Stub {













        mAppOpsCheckingService.systemReady();















        initializeUidStates();





























        getUserManagerInternal().addUserLifecycleListener(













                new UserManagerInternal.UserLifecycleListener() {













                    @Override













                    public void onUserCreated(UserInfo user, Object token) {













                        initializeUserUidStates(user.id);













                    }



























                    // onUserRemoved handled by #removeUser













                });





























        mConstants.startMonitoring(mContext.getContentResolver());















        mHistoricalRegistry.systemReady(mContext.getContentResolver());


























@@ -1099,6 +1089,42 @@ public class AppOpsService extends IAppOpsService.Stub {













            }















        }





























        getUserManagerInternal().addUserLifecycleListener(













                new UserManagerInternal.UserLifecycleListener() {













                    @Override













                    public void onUserCreated(UserInfo user, Object token) {













                        initializeUserUidStates(user.id);













                    }



























                    // onUserRemoved handled by #removeUser













                });



























        getPackageManagerInternal().getPackageList(













                new PackageManagerInternal.PackageListObserver() {













                    @Override













                    public void onPackageAdded(String packageName, int appId) {













                        PackageInfo pi = getPackageManagerInternal().getPackageInfo(packageName,













                                PackageManager.GET_PERMISSIONS, Process.myUid(),













                                mContext.getUserId());













                        if (isSamplingTarget(pi)) {













                            synchronized (AppOpsService.this) {













                                mRarelyUsedPackages.add(packageName);













                            }













                        }













                    }



























                    @Override













                    public void onPackageRemoved(String packageName, int appId) {













                        int[] userIds = getUserManagerInternal().getUserIds();













                        synchronized (AppOpsService.this) {













                            for (int i = 0; i < userIds.length; i++) {













                                int uid = UserHandle.getUid(userIds[i], appId);













                                packageRemovedLocked(uid, packageName);













                            }













                        }













                    }













                });





























        final IntentFilter packageSuspendFilter = new IntentFilter();















        packageSuspendFilter.addAction(Intent.ACTION_PACKAGES_UNSUSPENDED);















        packageSuspendFilter.addAction(Intent.ACTION_PACKAGES_SUSPENDED);










@@ -1128,25 +1154,6 @@ public class AppOpsService extends IAppOpsService.Stub {













            }















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





























        final IntentFilter packageAddedFilter = new IntentFilter();













        packageAddedFilter.addAction(Intent.ACTION_PACKAGE_ADDED);













        packageAddedFilter.addDataScheme("package");













        mContext.registerReceiver(new BroadcastReceiver() {













            @Override













            public void onReceive(Context context, Intent intent) {













                final Uri data = intent.getData();



























                final String packageName = data.getSchemeSpecificPart();













                PackageInfo pi = getPackageManagerInternal().getPackageInfo(packageName,













                        PackageManager.GET_PERMISSIONS, Process.myUid(), mContext.getUserId());













                if (isSamplingTarget(pi)) {













                    synchronized (AppOpsService.this) {













                        mRarelyUsedPackages.add(packageName);













                    }













                }













            }













        }, packageAddedFilter);





























        mHandler.postDelayed(new Runnable() {















            @Override















            public void run() {










@@ -1231,8 +1238,15 @@ public class AppOpsService extends IAppOpsService.Stub {













        mCheckOpsDelegateDispatcher = new CheckOpsDelegateDispatcher(policy, delegate);















    }





























    public void packageRemoved(int uid, String packageName) {













    @VisibleForTesting













    void packageRemoved(int uid, String packageName) {















        synchronized (this) {













            packageRemovedLocked(uid, packageName);













        }













    }



























    @GuardedBy("this")













    private void packageRemovedLocked(int uid, String packageName) {















        UidState uidState = mUidStates.get(uid);















        if (uidState == null) {















            return;










@@ -1274,7 +1288,6 @@ public class AppOpsService extends IAppOpsService.Stub {













                }















            }















        }













        }































        mHandler.post(PooledLambda.obtainRunnable(HistoricalRegistry::clearHistory,















                    mHistoricalRegistry, uid, packageName));