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

Commit bd6ab551 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "policy: Fix slide lid open state" into ics

parents f9baebac cc2ffef1

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;

            }

        }