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

Commit 88c90832 authored by Christopher Tate's avatar Christopher Tate
Browse files

Update PackageMonitor to recognize new 'replacing' semantics 

The ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE broadcast now uses the
EXTRA_REPLACING intent extra when it is sent as part of an upgrade operation
on a forward-locked application.  Update PackageMonitor to recognize this
new information and express it appropriately to the observer.

Bug 11988313

Cherry-pick from master.

Change-Id: Iecea1876ffc918f23f9fa5845f1f89ed8d740dd5
parent 4ef0aabe

core/java/com/android/internal/content/PackageMonitor.java

+6 −4
Original line number Diff line number Diff line
@@ -372,23 +372,25 @@ public abstract class PackageMonitor extends android.content.BroadcastReceiver { 
        } else if (Intent.ACTION_EXTERNAL_APPLICATIONS_AVAILABLE.equals(action)) {

            String[] pkgList = intent.getStringArrayExtra(Intent.EXTRA_CHANGED_PACKAGE_LIST);

            mAppearingPackages = pkgList;

            mChangeType = PACKAGE_TEMPORARY_CHANGE;

            mChangeType = intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)

                    ? PACKAGE_UPDATING : PACKAGE_TEMPORARY_CHANGE;

            mSomePackagesChanged = true;

            if (pkgList != null) {

                onPackagesAvailable(pkgList);

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

                    onPackageAppeared(pkgList[i], PACKAGE_TEMPORARY_CHANGE);

                    onPackageAppeared(pkgList[i], mChangeType);

                }

            }

        } else if (Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE.equals(action)) {

            String[] pkgList = intent.getStringArrayExtra(Intent.EXTRA_CHANGED_PACKAGE_LIST);

            mDisappearingPackages = pkgList;

            mChangeType = PACKAGE_TEMPORARY_CHANGE;

            mChangeType = intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)

                    ? PACKAGE_UPDATING : PACKAGE_TEMPORARY_CHANGE;

            mSomePackagesChanged = true;

            if (pkgList != null) {

                onPackagesUnavailable(pkgList);

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

                    onPackageDisappeared(pkgList[i], PACKAGE_TEMPORARY_CHANGE);

                    onPackageDisappeared(pkgList[i], mChangeType);

                }

            }

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -867,7 +867,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
                                    int[] uidArray = new int[] { res.pkg.applicationInfo.uid };

                                    ArrayList<String> pkgList = new ArrayList<String>(1);

                                    pkgList.add(res.pkg.applicationInfo.packageName);

                                    sendResourcesChangedBroadcast(true, false,

                                    sendResourcesChangedBroadcast(true, true,

                                            pkgList,uidArray, null);

                                }

                            }
@@ -11058,7 +11058,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
            if (uidArr != null) {

                extras.putIntArray(Intent.EXTRA_CHANGED_UID_LIST, uidArr);

            }

            if (replacing && !mediaStatus) {

            if (replacing) {

                extras.putBoolean(Intent.EXTRA_REPLACING, replacing);

            }

            String action = mediaStatus ? Intent.ACTION_EXTERNAL_APPLICATIONS_AVAILABLE