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

Commit d2d0955e authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Revert to O home button behaviour for over lockscreen activities" into pi-dev 

am: e8b7b306

Change-Id: I539bcfbe9583c67873492c2f210cf4a863265150
parents e62c95c6 e8b7b306

services/core/java/com/android/server/policy/PhoneWindowManager.java

+3 −11
Original line number Original line Diff line number Diff line
@@ -4397,17 +4397,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            if (isKeyguardShowingAndNotOccluded()) {

            if (isKeyguardShowingAndNotOccluded()) {

                // don't launch home if keyguard showing

                // don't launch home if keyguard showing

                return;

                return;

            } else if (mKeyguardOccluded && mKeyguardDelegate.isShowing()) {

                mKeyguardDelegate.dismiss(new KeyguardDismissCallback() {

                    @Override

                    public void onDismissSucceeded() throws RemoteException {

                        mHandler.post(() -> {

                            startDockOrHome(true /*fromHomeKey*/, awakenFromDreams);

                        });

            }

            }

                }, null /* message */);



                return;

            if (!mKeyguardOccluded && mKeyguardDelegate.isInputRestricted()) {

            } else if (!mKeyguardOccluded && mKeyguardDelegate.isInputRestricted()) {

                // when in keyguard restricted mode, must first verify unlock

                // when in keyguard restricted mode, must first verify unlock

                // before launching home

                // before launching home

                mKeyguardDelegate.verifyUnlock(new OnKeyguardExitResult() {

                mKeyguardDelegate.verifyUnlock(new OnKeyguardExitResult() {