Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 4553be6e30

Change-Id: I78c2143c1fed3736cb9bd8714b12dd829b4dcaeb
This commit is contained in:
Wale Ogunwale
2016-06-20 21:31:36 +00:00
committed by android-build-merger
parent 7e346ef853 4553be6e30
commit 4af72f335a
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -18781,7 +18781,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.

3
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -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;
}