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

Commit ea48ff4b authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am 95105f3c: am c3fc2d03: Fix safe mode and KeyEvent.getMaxKeyCode(). 

Merge commit '95105f3c'

* commit '95105f3c':
  Fix safe mode and KeyEvent.getMaxKeyCode().
parents fb8e05b1 95105f3c

core/java/android/view/KeyEvent.java

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ public class KeyEvent extends InputEvent implements Parcelable { 
    //  those new codes.  This is intended to maintain a consistent

    //  set of key code definitions across all Android devices.

   

    private static final int LAST_KEYCODE           = KEYCODE_SWITCH_CHARSET;

    private static final int LAST_KEYCODE           = KEYCODE_BUTTON_MODE;

    

    /**

     * @deprecated There are now more than MAX_KEYCODE keycodes.

include/ui/InputReader.h

+2 −0
Original line number Diff line number Diff line
@@ -454,6 +454,8 @@ public: 
    virtual void reset();

    virtual void process(const RawEvent* rawEvent);



    virtual int32_t getScanCodeState(uint32_t sourceMask, int32_t scanCode);



private:

    // Amount that trackball needs to move in order to generate a key event.

    static const int32_t TRACKBALL_MOVEMENT_THRESHOLD = 6;

libs/ui/InputReader.cpp

+8 −0
Original line number Diff line number Diff line
@@ -1080,6 +1080,14 @@ void TrackballInputMapper::applyPolicyAndDispatch(nsecs_t when, int32_t motionEv 
            1, & pointerId, pointerCoords, mXPrecision, mYPrecision, downTime);

}



int32_t TrackballInputMapper::getScanCodeState(uint32_t sourceMask, int32_t scanCode) {

    if (scanCode >= BTN_MOUSE && scanCode < BTN_JOYSTICK) {

        return getEventHub()->getScanCodeState(getDeviceId(), scanCode);

    } else {

        return AKEY_STATE_UNKNOWN;

    }

}





// --- TouchInputMapper ---