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

Commit 2b3a6a4e authored by Matt Filetto's avatar Matt Filetto Committed by Michael Bestas
Browse files

policy: don't allow app switch/recents key to be pressed on lockscreen 

Change-Id: I25223fef03896b86a4c56ec8abfbfc3b4591eaea
(cherry picked from commit 21f34c6e)
parent 357fce85

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+25 −23
Original line number Diff line number Diff line
@@ -2861,6 +2861,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            }

            return 0;

        } else if (keyCode == KeyEvent.KEYCODE_APP_SWITCH) {

            if (!keyguardOn) {

                if (down) {

                    if (mPressOnAppSwitchBehavior == KEY_ACTION_APP_SWITCH

                            || mLongPressOnAppSwitchBehavior == KEY_ACTION_APP_SWITCH) {
@@ -2869,7 +2870,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    if (repeatCount == 0) {

                        mAppSwitchLongPressed = false;

                    } else if (longPress) {

                    if (!keyguardOn && mLongPressOnAppSwitchBehavior != KEY_ACTION_NOTHING) {

                        if (mLongPressOnAppSwitchBehavior != KEY_ACTION_NOTHING) {

                            if (mLongPressOnAppSwitchBehavior != KEY_ACTION_APP_SWITCH) {

                                cancelPreloadRecentApps();

                            }
@@ -2890,6 +2891,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                        }

                    }

                }

            }

            return -1;

        } else if (keyCode == KeyEvent.KEYCODE_ASSIST) {

            if (down) {