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

Commit e213d86d authored by Adam Lesinski's avatar Adam Lesinski Committed by Android Git Automerger
Browse files

am 6c7ca6f5: am 7b7b7eb8: am 390a3f45: Merge "Revert behavior of Lockscreen... 

am 6c7ca6f5: am 7b7b7eb8: am 390a3f45: Merge "Revert behavior of Lockscreen Activity Launch to KK" into lmp-dev

* commit '6c7ca6f57c02d775f9ad588977a84abb8efd8a33':
  Revert behavior of Lockscreen Activity Launch to KK
parents e49c6ed0 408f24da

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

+5 −11
Original line number Diff line number Diff line
@@ -936,13 +936,6 @@ public final class ActivityManagerService extends ActivityManagerNative 
     */

    private boolean mRunningVoice = false;













    /**













     * Set while the keyguard is waiting for an activity to draw.













     * In this state, if we are sleeping, we allow Activities to launch













     * so that they can draw before Keyguard dismisses itself.













     */













    private boolean mKeyguardWaitingForDraw = false;



























    /**















     * State of external calls telling us if the device is asleep.















     */










@@ -6256,7 +6249,10 @@ public final class ActivityManagerService extends ActivityManagerNative













            synchronized (this) {















                if (DEBUG_LOCKSCREEN) logLockScreen("");















                mWindowManager.keyguardWaitingForActivityDrawn();













                mKeyguardWaitingForDraw = true;













                if (mLockScreenShown) {













                    mLockScreenShown = false;













                    comeOutOfSleepIfNeededLocked();













                }















            }















        } finally {















            Binder.restoreCallingIdentity(token);










@@ -9959,7 +9955,7 @@ public final class ActivityManagerService extends ActivityManagerNative













    }





























    public boolean isSleeping() {













        return mSleeping && !mKeyguardWaitingForDraw;













        return mSleeping;















    }





























    void goingToSleep() {









@@ -9980,7 +9976,6 @@ public final class ActivityManagerService extends ActivityManagerNative













        if (mWentToSleep && !mRunningVoice) {















            if (!mSleeping) {















                mSleeping = true;













                mKeyguardWaitingForDraw = false;















                mStackSupervisor.goingToSleepLocked();





























                // Initialize the wake times of all processes.










@@ -10089,7 +10084,6 @@ public final class ActivityManagerService extends ActivityManagerNative













            try {















                if (DEBUG_LOCKSCREEN) logLockScreen(" shown=" + shown);















                mLockScreenShown = shown;













                mKeyguardWaitingForDraw = false;















                comeOutOfSleepIfNeededLocked();















            } finally {















                Binder.restoreCallingIdentity(ident);