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

Commit b22fe373 authored Jun 16, 2016 by Wale Ogunwale Committed by android-build-merger Jun 16, 2016

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

am: 55ce4a5f

Change-Id: I10ca3411e66acc2e156339645b5548c6d3f71d46

parents 4c3deff1 55ce4a5f

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

+1 −1

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

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

+2 −1

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

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