Merge "Schedule agentDisconnected() in handler thread" (c02a4a46) · Commits · e / os / android_frameworks_base

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

+24 −14

Original line number	Diff line number	Diff line
		@@ -6351,6 +6351,9 @@ public final class ActivityManagerService extends ActivityManagerNative
		removeLruProcessLocked(app);
		if (mBackupTarget != null && mBackupTarget.app.pid == pid) {
		Slog.w(TAG, "Unattached app died before backup, skipping");
		mHandler.post(new Runnable() {
		@Override
		public void run(){
		try {
		IBackupManager bm = IBackupManager.Stub.asInterface(
		ServiceManager.getService(Context.BACKUP_SERVICE));
		@@ -6359,6 +6362,8 @@ public final class ActivityManagerService extends ActivityManagerNative
		// Can't happen; the backup manager is local
		}
		}
		});
		}
		if (isPendingBroadcastProcessLocked(pid)) {
		Slog.w(TAG, "Unattached app died before broadcast acknowledged, skipping");
		skipPendingBroadcastLocked(pid);
		@@ -16766,6 +16771,9 @@ public final class ActivityManagerService extends ActivityManagerNative
		if (mBackupTarget != null && app.pid == mBackupTarget.app.pid) {
		if (DEBUG_BACKUP \|\| DEBUG_CLEANUP) Slog.d(TAG_CLEANUP, "App "
		+ mBackupTarget.appInfo + " died during backup");
		mHandler.post(new Runnable() {
		@Override
		public void run(){
		try {
		IBackupManager bm = IBackupManager.Stub.asInterface(
		ServiceManager.getService(Context.BACKUP_SERVICE));
		@@ -16774,6 +16782,8 @@ public final class ActivityManagerService extends ActivityManagerNative
		// can't happen; backup manager is local
		}
		}
		});
		}

		for (int i = mPendingProcessChanges.size() - 1; i >= 0; i--) {
		ProcessChangeItem item = mPendingProcessChanges.get(i);