drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix lid switch interpretation.

Browse Source 
Also remove unnecessary permission check for method that is
only called internally.

Change-Id: I32f63fc3e96b06709d18b046ee2d3c8f310de70d
This commit is contained in:
Jeff Brown
2012-04-09 11:05:16 -07:00
parent eca3cf58c0
commit 27fd3420ac
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/java/com/android/server/wm/WindowManagerService.java
View File

@ -4807,10 +4807,13 @@ public class WindowManagerService extends IWindowManager.Stub
final int SW_LID = 0x00;
int sw = mInputManager.getSwitchState(-1, InputDevice.SOURCE_ANY, SW_LID);
if (sw > 0) {
return LID_OPEN;
} else if (sw == 0) {
// Switch state: AKEY_STATE_DOWN or AKEY_STATE_VIRTUAL.
return LID_CLOSED;
} else if (sw == 0) {
// Switch state: AKEY_STATE_UP.
return LID_OPEN;
} else {
// Switch state: AKEY_STATE_UNKNOWN.
return LID_ABSENT;
}
}
@ -4818,10 +4821,6 @@ public class WindowManagerService extends IWindowManager.Stub
// Called by window manager policy. Not exposed externally.
@Override
public InputChannel monitorInput(String inputChannelName) {
if (!checkCallingPermission(android.Manifest.permission.READ_INPUT_STATE,
"monitorInput()")) {
throw new SecurityException("Requires READ_INPUT_STATE permission");
}
return mInputManager.monitorInput(inputChannelName);
}