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

Commit eabc24ac authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge "Handle "uninstall updates" in app-ops-service" into qt-qpr1-dev am: 4d959eeb 

am: aba2f830

Change-Id: I840c53bd84bf67bf1ddd8481d6ca358ad7071696
parents 0679a159 aba2f830

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

+6 −1
Original line number Diff line number Diff line
@@ -15262,8 +15262,13 @@ public class ActivityManagerService extends IActivityManager.Stub 
                            final int uid = getUidFromIntent(intent);

                            if (uid >= 0) {

                                mBatteryStatsService.removeUid(uid);

                                if (intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)) {

                                    mAppOpsService.resetAllModes(UserHandle.getUserId(uid),

                                            intent.getData().getSchemeSpecificPart());

                                } else {

                                    mAppOpsService.uidRemoved(uid);

                                }

                            }

                            break;

                        case Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE:

                            // If resources are unavailable just force stop all those packages

services/core/java/com/android/server/pm/PackageManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -17931,7 +17931,7 @@ public class PackageManagerService extends IPackageManager.Stub 
            }

            if (removedAppId >= 0) {

                packageSender.sendPackageBroadcast(Intent.ACTION_UID_REMOVED,

                    null, extras, Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND,

                        removedPackage, extras, Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND,

                    null, null, broadcastUsers, instantUserIds);

            }

        }