Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit 'a1394dbc8d29115780f523fdff8d6401023136ef'

* commit 'a1394dbc8d29115780f523fdff8d6401023136ef':
  Fix issue #2249821: Unable to start passion in safe mode
This commit is contained in:
Dianne Hackborn
2009-11-18 12:01:45 -08:00
committed by Android Git Automerger
parent d3748ac49e 4d60c95650
commit d6fea47abd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
policy/com/android/internal/policy/impl/PhoneWindowManager.java
View File

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