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

Commit cb6b7301 authored by Prabir Pradhan's avatar Prabir Pradhan Committed by Automerger Merge Worker
Browse files

Merge "Remove exception for injecting pointer event from... 

Merge "Remove exception for injecting pointer event from sendTrackballEventSync" into tm-dev am: 605556d5 am: 9cd20e41

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17592143



Change-Id: Iee734df7f330be1411bcbfc73dcbecede6e7eec7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7b8af988 9cd20e41

core/java/android/app/Instrumentation.java

+0 −5
Original line number Original line Diff line number Diff line
@@ -1207,11 +1207,6 @@ public class Instrumentation { 
     */

     */

    public void sendTrackballEventSync(MotionEvent event) {

    public void sendTrackballEventSync(MotionEvent event) {

        validateNotAppThread();

        validateNotAppThread();

        if (event.isFromSource(InputDevice.SOURCE_CLASS_POINTER)) {

            throw new IllegalArgumentException(

                    "Cannot inject pointer events from sendTrackballEventSync()."

                            + " Use sendPointerSync() to inject pointer events.");

        }

        if (!event.isFromSource(InputDevice.SOURCE_CLASS_TRACKBALL)) {

        if (!event.isFromSource(InputDevice.SOURCE_CLASS_TRACKBALL)) {

            event.setSource(InputDevice.SOURCE_TRACKBALL);

            event.setSource(InputDevice.SOURCE_TRACKBALL);

        }

        }