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

Commit 44aa01a5 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am bbacc28f: Fix issue #2249821: Unable to start passion in safe mode 

Merge commit 'bbacc28ff4ea2892ae4c0a0d9a639a960a4dd93a' into eclair-plus-aosp

* commit 'bbacc28ff4ea2892ae4c0a0d9a639a960a4dd93a':
  Fix issue #2249821: Unable to start passion in safe mode
parents 2fa63a53 a8730f98

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

+2 −2
Original line number Diff line number Diff line
@@ -1997,8 +1997,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        try {

            int menuState = mWindowManager.getKeycodeState(KeyEvent.KEYCODE_MENU);

            int sState = mWindowManager.getKeycodeState(KeyEvent.KEYCODE_S);

            int dpadState = mWindowManager.getKeycodeState(KeyEvent.KEYCODE_DPAD_CENTER);

            int trackballState = mWindowManager.getScancodeState(RawInputEvent.BTN_MOUSE);

            int dpadState = mWindowManager.getDPadKeycodeState(KeyEvent.KEYCODE_DPAD_CENTER);

            int trackballState = mWindowManager.getTrackballScancodeState(RawInputEvent.BTN_MOUSE);

            mSafeMode = menuState > 0 || sState > 0 || dpadState > 0 || trackballState > 0;

            performHapticFeedbackLw(null, mSafeMode

                    ? HapticFeedbackConstants.SAFE_MODE_ENABLED