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

Commit 96eea713 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

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

am: beaf3707

Change-Id: I50f6a45a56650569047c046d275f39b0929c38e4
parents 901c03fa beaf3707

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

+1 −1
Original line number Diff line number Diff line
@@ -18723,7 +18723,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.

























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



+1
−2




























Original line number
Diff line number
Diff line








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















        }