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

Commit 87505bb5 authored by Todd Kennedy's avatar Todd Kennedy
Browse files

Use the installer package name for broadcasts 

We would send the broadcast to the installer of record for
the _removed_ package [ie. replaced]. There was no value
containing the installer of record for the _installed_
package. Now prefer to send the broadcast to the installer
of record for the install. Otherwise, use the installer of
record for removal.

Change-Id: Idb1a7fa522a19273eb3641746e1966aa7af97e7c
Fixes: 62905206
Test: Manual. 'adb install test.apk' doesn't fire broadcast to the installer.
Test: Manual. 'adb install -i com.foo test.apk' fires broadcast to "com.foo".
Test: Manual. 'adb install -r test.apk' fires broadcast to "com.foo" installer.
Test: Manual. 'adb install -r -i com.foo2 test.apk' fires broadcast to "com.foo2".
parent 003bd7e3

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

+12 −6
Original line number Diff line number Diff line
@@ -1926,8 +1926,12 @@ public class PackageManagerService extends IPackageManager.Stub 














            final boolean update = res.removedInfo != null















                    && res.removedInfo.removedPackage != null;













            final String origInstallerPackageName = res.removedInfo != null













                    ? res.removedInfo.installerPackageName : null;













            final String installerPackageName =













                    res.installerPackageName != null













                            ? res.installerPackageName













                            : res.removedInfo != null













                                    ? res.removedInfo.installerPackageName













                                    : null;





























            // If this is the first time we have child packages for a disabled privileged















            // app that had no children, we grant requested runtime permissions to the new










@@ -1992,10 +1996,10 @@ public class PackageManagerService extends IPackageManager.Stub













                sendPackageBroadcast(Intent.ACTION_PACKAGE_ADDED, packageName,















                        extras, 0 /*flags*/,















                        null /*targetPackage*/, null /*finishedReceiver*/, updateUsers);













                if (origInstallerPackageName != null) {













                if (installerPackageName != null) {















                    sendPackageBroadcast(Intent.ACTION_PACKAGE_ADDED, packageName,















                            extras, 0 /*flags*/,













                            origInstallerPackageName, null /*finishedReceiver*/, updateUsers);













                            installerPackageName, null /*finishedReceiver*/, updateUsers);















                }





























                // Send replaced for users that don't see the package for the first time









@@ -2004,10 +2008,10 @@ public class PackageManagerService extends IPackageManager.Stub













                            packageName, extras, 0 /*flags*/,















                            null /*targetPackage*/, null /*finishedReceiver*/,















                            updateUsers);













                    if (origInstallerPackageName != null) {













                    if (installerPackageName != null) {















                        sendPackageBroadcast(Intent.ACTION_PACKAGE_REPLACED, packageName,















                                extras, 0 /*flags*/,













                                origInstallerPackageName, null /*finishedReceiver*/, updateUsers);













                                installerPackageName, null /*finishedReceiver*/, updateUsers);















                    }















                    sendPackageBroadcast(Intent.ACTION_MY_PACKAGE_REPLACED,















                            null /*package*/, null /*extras*/, 0 /*flags*/,










@@ -17330,6 +17334,7 @@ public class PackageManagerService extends IPackageManager.Stub













        PackageParser.Package pkg;















        int returnCode;















        String returnMsg;













        String installerPackageName;















        PackageRemovedInfo removedInfo;















        ArrayMap<String, PackageInstalledInfo> addedChildPackages;
























@@ -18250,6 +18255,7 @@ public class PackageManagerService extends IPackageManager.Stub



























        // Result object to be returned















        res.setReturnCode(PackageManager.INSTALL_SUCCEEDED);













        res.installerPackageName = installerPackageName;





























        if (DEBUG_INSTALL) Slog.d(TAG, "installPackageLI: path=" + tmpPackageFile);