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

Commit bdd774cb authored Jun 20, 2016 by Wale Ogunwale Committed by The Android Automerger Jun 20, 2016

Revert "Don't re-launch activities while the device is sleeping"

This reverts commit 0619545b.

Bug: 29497152
Bug: 28518380
Change-Id: I8684b731b1e9973ead7066dc650eff720f70ac91

parent 8aecd5ac

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

+1 −1

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

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

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

+1 −2

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

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