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

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

Merge "Put package name in extra not data" into qt-qpr1-dev am: f94fa065 

am: f33b6733

Change-Id: I30c6056d3e99addaae9b27046b1bbcbd74fe2f86
parents d0d5257b f33b6733

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

+1 −1
Original line number Diff line number Diff line
@@ -15267,7 +15267,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
                                mBatteryStatsService.removeUid(uid);

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

                                    mAppOpsService.resetAllModes(UserHandle.getUserId(uid),

                                            intent.getData().getSchemeSpecificPart());

                                            intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME));

                                } else {

                                    mAppOpsService.uidRemoved(uid);

                                }

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

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

            }

            if (removedAppId >= 0) {

                // If a system app's updates are uninstalled the UID is not actually removed. Some

                // services need to know the package name affected.

                if (extras.getBoolean(Intent.EXTRA_REPLACING, false)) {

                    extras.putString(Intent.EXTRA_PACKAGE_NAME, removedPackage);

                }















                packageSender.sendPackageBroadcast(Intent.ACTION_UID_REMOVED,













                        removedPackage, extras, Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND,













                        null, extras, Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND,















                    null, null, broadcastUsers, instantUserIds);















            }















        }