Merge "Remove exception for injecting pointer event from sendTrackballEventSync" into tm-dev am: 605556d50e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17592143 Change-Id: I6fe07afdfa3841785db7e3590fc751c06786b34d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user