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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2016-06-16 21:32:26 +00:00
committed by Android (Google) Code Review
parent 320c15e1b2 0619545be9
commit f6e3c9a553
2 changed files with 3 additions and 2 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

@@ -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.

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

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