summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xpolicy/src/com/android/internal/policy/impl/PhoneWindowManager.java4
-rw-r--r--services/input/InputReader.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 32a0cd9..3a70bc1 100755
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -1115,9 +1115,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
try {
int sw = mWindowManager.getSwitchState(SW_LID);
if (sw > 0) {
- mLidOpen = LID_OPEN;
- } else if (sw == 0) {
mLidOpen = LID_CLOSED;
+ } else if (sw == 0) {
+ mLidOpen = LID_OPEN;
} else {
mLidOpen = LID_ABSENT;
}
diff --git a/services/input/InputReader.cpp b/services/input/InputReader.cpp
index 4ab2118..71f0b6d 100644
--- a/services/input/InputReader.cpp
+++ b/services/input/InputReader.cpp
@@ -645,7 +645,7 @@ int32_t InputReader::getStateLocked(int32_t deviceId, uint32_t sourceMask, int32
InputDevice* device = mDevices.valueAt(i);
if (! device->isIgnored() && sourcesMatchMask(device->getSources(), sourceMask)) {
result = (device->*getStateFunc)(sourceMask, code);
- if (result >= AKEY_STATE_DOWN) {
+ if (result >= AKEY_STATE_UP) {
return result;
}
}
@@ -1057,7 +1057,7 @@ int32_t InputDevice::getState(uint32_t sourceMask, int32_t code, GetStateFunc ge
InputMapper* mapper = mMappers[i];
if (sourcesMatchMask(mapper->getSources(), sourceMask)) {
result = (mapper->*getStateFunc)(sourceMask, code);
- if (result >= AKEY_STATE_DOWN) {
+ if (result >= AKEY_STATE_UP) {
return result;
}
}