From 60920d5aa11bbb0e82a7f101cee825586e87aff0 Mon Sep 17 00:00:00 2001 From: Wale Ogunwale Date: Mon, 20 Jun 2016 10:45:13 -0700 Subject: [PATCH] Revert "Don't re-launch activities while the device is sleeping" This reverts commit 0619545be9adca4458cb627c18c211faad6b6275. Bug: 29497152 Bug: 28518380 Change-Id: I8684b731b1e9973ead7066dc650eff720f70ac91 --- .../java/com/android/server/am/ActivityManagerService.java | 2 +- services/core/java/com/android/server/am/ActivityStack.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index e9841129c4c3a..28fdfd1d615d7 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -18780,7 +18780,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. diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 6af7a5db247e3..c5eacd615ec1c 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -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; }