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

Commit cc2ffef1 authored Jan 18, 2012 by Won-Kyu Park

policy: Fix slide lid open state

by commit 4aed78b5 lidOpen was reverted.
fix to make lidOpen true when sw == 0.
and fix getStateLocked()/getState() to get UP/DOWN state correctly.

Change-Id: I22a185478be860f1c88cf56d7ef3d0b3a8617459

parent c8e3afba

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}

services/input/InputReader.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}