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

Commit b0c69f18 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Put package name in extra not data 

as broadcast receivers filter on data, not on extras. Hence changing
data changes the API.

Fixes: 141452043
Test: Uninstalled updates from system app and saw correct app-ops method
      to be called
      atest CtsHostsideNetworkTests:com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testDataSaverMode_reinstall

Change-Id: Icab1fcea6153d5bbf0bf2af51e71d7fd6b5cb3e5
parent 25309b11

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

+1 −1
Original line number Diff line number Diff line
@@ -14999,7 +14999,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
@@ -18821,8 +18821,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);















            }















        }