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

Commit f6e3c9a5 authored Jun 16, 2016 by TreeHugger Robot Committed by Android (Google) Code Review Jun 16, 2016

Merge "Don't re-launch activities while the device is sleeping" into nyc-dev

parents 320c15e1 0619545b

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -18714,7 +18714,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		starting = mainStack.topRunningActivityLocked();
		}

		if (starting != null) {
		if (starting != null && starting.state != ActivityState.STOPPED) {
		kept = mainStack.ensureActivityConfigurationLocked(starting, changes, false);
		// And we need to make sure at this point that all other activities
		// are made visible with the correct configuration.

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -1820,7 +1820,8 @@ final class ActivityStack {
		boolean stackVisibleBehind, ActivityRecord visibleBehind,
		boolean behindFullscreenActivity) {

		if (!okToShowLocked(r)) {
		if (!okToShowLocked(r)
		\|\| (mService.isSleepingOrShuttingDown() && r.voiceSession == null)) {
		return false;
		}