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

Commit 40f3540e authored Jun 20, 2016 by Wale Ogunwale Committed by android-build-merger Jun 20, 2016

Merge \\"Revert \\"Don\\'t re-launch activities while the device is...

Merge \\"Revert \\"Don\\'t re-launch activities while the device is sleeping\\"\\" into nyc-dev am: beaf3707
am: 96eea713

Change-Id: I5f76f0854d0831839f87f2faccaba690d864c5b8

parents c07a7518 96eea713

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

+1 −1

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

		if (starting != null && starting.state != ActivityState.STOPPED) {
		if (starting != null) {
		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

+1 −2

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

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