Fix issue #2249821: Unable to start passion in safe mode
Holding down the trackball now works.
Also fix a little API check warning from Intent.
Change-Id: Icb1f901535cb521917bf7f847a93c4ff7861d20e
diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index 327cd72..887c46d 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -4192,6 +4192,22 @@
return mQueue.getScancodeState(devid, sw);
}
+ public int getTrackballScancodeState(int sw) {
+ if (!checkCallingPermission(android.Manifest.permission.READ_INPUT_STATE,
+ "getTrackballScancodeState()")) {
+ throw new SecurityException("Requires READ_INPUT_STATE permission");
+ }
+ return mQueue.getTrackballScancodeState(sw);
+ }
+
+ public int getDPadScancodeState(int sw) {
+ if (!checkCallingPermission(android.Manifest.permission.READ_INPUT_STATE,
+ "getDPadScancodeState()")) {
+ throw new SecurityException("Requires READ_INPUT_STATE permission");
+ }
+ return mQueue.getDPadScancodeState(sw);
+ }
+
public int getKeycodeState(int sw) {
if (!checkCallingPermission(android.Manifest.permission.READ_INPUT_STATE,
"getKeycodeState()")) {
@@ -4208,6 +4224,22 @@
return mQueue.getKeycodeState(devid, sw);
}
+ public int getTrackballKeycodeState(int sw) {
+ if (!checkCallingPermission(android.Manifest.permission.READ_INPUT_STATE,
+ "getTrackballKeycodeState()")) {
+ throw new SecurityException("Requires READ_INPUT_STATE permission");
+ }
+ return mQueue.getTrackballKeycodeState(sw);
+ }
+
+ public int getDPadKeycodeState(int sw) {
+ if (!checkCallingPermission(android.Manifest.permission.READ_INPUT_STATE,
+ "getDPadKeycodeState()")) {
+ throw new SecurityException("Requires READ_INPUT_STATE permission");
+ }
+ return mQueue.getDPadKeycodeState(sw);
+ }
+
public boolean hasKeys(int[] keycodes, boolean[] keyExists) {
return KeyInputQueue.hasKeys(keycodes, keyExists);
}