Merge "Stop activity onVisibleBehindCanceled()" into lmp-mr1-dev (70273e05) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -6260,7 +6260,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		synchronized (this) {
		ActivityStack stack = ActivityRecord.getStackLocked(token);
		if (stack != null) {
		stack.backgroundResourcesReleased(token);
		stack.backgroundResourcesReleased();
		}
		}
		} finally {

+3 −2

Original line number	Diff line number	Diff line
		@@ -3317,17 +3317,18 @@ final class ActivityStack {
		mHandler.sendEmptyMessageDelayed(RELEASE_BACKGROUND_RESOURCES_TIMEOUT_MSG, 500);
		} else {
		Slog.e(TAG, "releaseBackgroundResources: activity " + r + " no longer running");
		backgroundResourcesReleased(r.appToken);
		backgroundResourcesReleased();
		}
		}
		}

		final void backgroundResourcesReleased(IBinder token) {
		final void backgroundResourcesReleased() {
		mHandler.removeMessages(RELEASE_BACKGROUND_RESOURCES_TIMEOUT_MSG);
		final ActivityRecord r = getVisibleBehindActivity();
		if (r != null) {
		mStackSupervisor.mStoppingActivities.add(r);
		setVisibleBehindActivity(null);
		mStackSupervisor.scheduleIdleTimeoutLocked(null);
		}
		mStackSupervisor.resumeTopActivitiesLocked();
		}