Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: dbcca24f8e

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

Change-Id: I020e1ccbd04ada3c1ff7826042bc476b8a755584
This commit is contained in:
Dianne Hackborn
2016-05-26 00:53:58 +00:00
committed by android-build-merger
parent 57b00f7c6a dbcca24f8e
commit ce60320848
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -17520,13 +17520,13 @@ public final class ActivityManagerService extends ActivityManagerNative
final boolean killProcess = final boolean killProcess =
!intent.getBooleanExtra(Intent.EXTRA_DONT_KILL_APP, false); !intent.getBooleanExtra(Intent.EXTRA_DONT_KILL_APP, false);
final boolean fullUninstall = removed && !replacing; final boolean fullUninstall = removed && !replacing;
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) { 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");
}
final int cmd = killProcess final int cmd = killProcess
? IApplicationThread.PACKAGE_REMOVED ? IApplicationThread.PACKAGE_REMOVED
: IApplicationThread.PACKAGE_REMOVED_DONT_KILL; : IApplicationThread.PACKAGE_REMOVED_DONT_KILL;
@@ -17543,6 +17543,12 @@ public final class ActivityManagerService extends ActivityManagerNative
mBatteryStatsService.notePackageUninstalled(ssp); mBatteryStatsService.notePackageUninstalled(ssp);
} }
} else { } 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, cleanupDisabledPackageComponentsLocked(ssp, userId, killProcess,
intent.getStringArrayExtra( intent.getStringArrayExtra(
Intent.EXTRA_CHANGED_COMPONENT_NAME_LIST)); Intent.EXTRA_CHANGED_COMPONENT_NAME_LIST));