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

Commit 85ddfffd authored by Siarhei Vishniakou's avatar Siarhei Vishniakou
Browse files

Move display id into MotionEvent 

Display id is now part of MotionEvent.

Test: atest view.MotionEventTest view.KeyEventTest
Bug: 64258305

Change-Id: Ifadd6b34f4dd5a91669baf146daa62944d1de974
parent f4a36820

config/hiddenapi-light-greylist.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -1725,7 +1725,7 @@ Landroid/view/InputDevice;->addMotionRange(IIFFFFF)V 
Landroid/view/InputDevice;-><init>(IIILjava/lang/String;IILjava/lang/String;ZIILandroid/view/KeyCharacterMap;ZZZ)V

Landroid/view/InputDevice;-><init>(IIILjava/lang/String;IILjava/lang/String;ZIILandroid/view/KeyCharacterMap;ZZZ)V

Landroid/view/InputDevice;->isExternal()Z

Landroid/view/InputDevice;->isExternal()Z

Landroid/view/InputEventReceiver;->dispatchBatchedInputEventPending()V

Landroid/view/InputEventReceiver;->dispatchBatchedInputEventPending()V

Landroid/view/InputEventReceiver;->dispatchInputEvent(ILandroid/view/InputEvent;I)V

Landroid/view/InputEventReceiver;->dispatchInputEvent(ILandroid/view/InputEvent;)V

Landroid/view/InputEventSender;->dispatchInputEventFinished(IZ)V

Landroid/view/InputEventSender;->dispatchInputEventFinished(IZ)V

Landroid/view/inputmethod/InputMethodInfo;->mSubtypes:Landroid/view/inputmethod/InputMethodSubtypeArray;

Landroid/view/inputmethod/InputMethodInfo;->mSubtypes:Landroid/view/inputmethod/InputMethodSubtypeArray;

Landroid/view/inputmethod/InputMethodManager;->finishInputLocked()V

Landroid/view/inputmethod/InputMethodManager;->finishInputLocked()V

core/java/android/hardware/input/InputManagerInternal.java

+8 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,14 @@ import java.util.List; 
 * @hide Only for use within the system server.

 * @hide Only for use within the system server.

 */

 */

public abstract class InputManagerInternal {

public abstract class InputManagerInternal {

    public abstract boolean injectInputEvent(InputEvent event, int displayId, int mode);

    /**

     * Inject an input event.

     *

     * @param event The InputEvent to inject

     * @param mode Synchronous or asynchronous mode

     * @return True if injection has succeeded

     */

    public abstract boolean injectInputEvent(InputEvent event, int mode);





    /**

    /**

     * Called by the display manager to set information about the displays as needed

     * Called by the display manager to set information about the displays as needed

core/java/android/inputmethodservice/IInputMethodSessionWrapper.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -218,7 +218,7 @@ class IInputMethodSessionWrapper extends IInputMethodSession.Stub 
        }

        }





        @Override

        @Override

        public void onInputEvent(InputEvent event, int displayId) {

        public void onInputEvent(InputEvent event) {

            if (mInputMethodSession == null) {

            if (mInputMethodSession == null) {

                // The session has been finished.

                // The session has been finished.

                finishInputEvent(event, false);

                finishInputEvent(event, false);

core/java/android/service/wallpaper/WallpaperService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -287,7 +287,7 @@ public abstract class WallpaperService extends Service { 
            }

            }





            @Override

            @Override

            public void onInputEvent(InputEvent event, int displayId) {

            public void onInputEvent(InputEvent event) {

                boolean handled = false;

                boolean handled = false;

                try {

                try {

                    if (event instanceof MotionEvent

                    if (event instanceof MotionEvent

core/java/android/view/InputEventReceiver.java

+3 −4
Original line number Original line Diff line number Diff line
@@ -111,10 +111,9 @@ public abstract class InputEventReceiver { 
     * to indicate whether the event was handled.  No new input events will be received

     * to indicate whether the event was handled.  No new input events will be received

     * until {@link #finishInputEvent} is called.

     * until {@link #finishInputEvent} is called.

     *

     *

     * @param displayId The display id on which input event triggered.

     * @param event The input event that was received.

     * @param event The input event that was received.

     */

     */

    public void onInputEvent(InputEvent event, int displayId) {

    public void onInputEvent(InputEvent event) {

        finishInputEvent(event, false);

        finishInputEvent(event, false);

    }

    }
@@ -181,9 +180,9 @@ public abstract class InputEventReceiver { 




    // Called from native code.

    // Called from native code.

    @SuppressWarnings("unused")

    @SuppressWarnings("unused")

    private void dispatchInputEvent(int seq, InputEvent event, int displayId) {

    private void dispatchInputEvent(int seq, InputEvent event) {

        mSeqMap.put(event.getSequenceNumber(), seq);

        mSeqMap.put(event.getSequenceNumber(), seq);

        onInputEvent(event, displayId);

        onInputEvent(event);

    }

    }





    // Called from native code.

    // Called from native code.