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

Commit 2198f8f5 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by android-build-merger
Browse files

Merge "Fix issue #28964589: Binding dies when (unrelated) component is... 

Merge "Fix issue #28964589: Binding dies when (unrelated) component is disabled in package" into nyc-dev
am: dbcca24f

* commit 'dbcca24f':
  Fix issue #28964589: Binding dies when (unrelated) component is disabled in package

Change-Id: Ie6041e1284ec6824f3b8c01f751f1555f55bc69e
parents aa833d7c dbcca24f

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

+12 −6
Original line number Diff line number Diff line
@@ -17520,13 +17520,13 @@ public final class ActivityManagerService extends ActivityManagerNative 
                                final boolean killProcess =

                                        !intent.getBooleanExtra(Intent.EXTRA_DONT_KILL_APP, false);

                                final boolean fullUninstall = removed && !replacing;

                                if (removed) {

                                    if (killProcess) {

                                        forceStopPackageLocked(ssp, UserHandle.getAppId(

                                                intent.getIntExtra(Intent.EXTRA_UID, -1)),

                                                false, true, true, false, fullUninstall, userId,

                                                removed ? "pkg removed" : "pkg changed");

                                    }

                                if (removed) {

                                    final int cmd = killProcess

                                            ? IApplicationThread.PACKAGE_REMOVED

                                            : IApplicationThread.PACKAGE_REMOVED_DONT_KILL;
@@ -17543,6 +17543,12 @@ public final class ActivityManagerService extends ActivityManagerNative 
                                        mBatteryStatsService.notePackageUninstalled(ssp);

                                    }

                                } else {

                                    if (killProcess) {

                                        killPackageProcessesLocked(ssp, UserHandle.getAppId(

                                                intent.getIntExtra(Intent.EXTRA_UID, -1)),

                                                userId, ProcessList.INVALID_ADJ,

                                                false, true, true, false, "change " + ssp);

                                    }

                                    cleanupDisabledPackageComponentsLocked(ssp, userId, killProcess,

                                            intent.getStringArrayExtra(

                                                    Intent.EXTRA_CHANGED_COMPONENT_NAME_LIST));