Merge \"Don\'t re-launch stopped activities while the device is sleeping\" into nyc-dev (87ca3c1f) · Commits · e / os / android_frameworks_base

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

+10 −1

Original line number	Diff line number	Diff line
		@@ -4448,7 +4448,7 @@ final class ActivityStack {
		}
		}
		if (updatedConfig) {
		// Ensure the resumed state of the focus activity if we updated the confiugaration of
		// Ensure the resumed state of the focus activity if we updated the configuration of
		// any activity.
		mStackSupervisor.resumeFocusedStackTopActivityLocked();
		}
		@@ -4468,6 +4468,15 @@ final class ActivityStack {
		return true;
		}

		// TODO: We could probably make the condition below just check that the activity state is
		// stopped, but also checking the sleep state for now to reduce change impact late in
		// development cycle.
		if (mService.isSleepingOrShuttingDownLocked() && r.state == ActivityState.STOPPED) {
		if (DEBUG_SWITCH \|\| DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION,
		"Skipping config check (stopped while sleeping): " + r);
		return true;
		}

		if (DEBUG_SWITCH \|\| DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION,
		"Ensuring correct configuration: " + r);