Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Input command can fail (with exceptions) if the touchscreen id is not 0"

Browse Source
This commit is contained in:
Michael Wright
2015-06-05 12:17:09 +00:00
committed by Gerrit Code Review
parent 34a63ba4d7 30fefa4d5d
commit 7d72fedd7e
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cmds/input/src/com/android/commands/input/Input.java
View File

@@ -234,6 +234,18 @@ public class Input {
InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH); InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH);
} }
private int getInputDeviceId(int inputSource) {
final int DEFAULT_DEVICE_ID = 0;
int[] devIds = InputDevice.getDeviceIds();
for (int devId : devIds) {
InputDevice inputDev = InputDevice.getDevice(devId);
if (inputDev.supportsSource(inputSource)) {
return devId;
}
}
return DEFAULT_DEVICE_ID;
}
/** /**
* Builds a MotionEvent and injects it into the event stream. * Builds a MotionEvent and injects it into the event stream.
* *
@@ -249,11 +261,10 @@ public class Input {
final int DEFAULT_META_STATE = 0; final int DEFAULT_META_STATE = 0;
final float DEFAULT_PRECISION_X = 1.0f; final float DEFAULT_PRECISION_X = 1.0f;
final float DEFAULT_PRECISION_Y = 1.0f; final float DEFAULT_PRECISION_Y = 1.0f;
final int DEFAULT_DEVICE_ID = 0;
final int DEFAULT_EDGE_FLAGS = 0; final int DEFAULT_EDGE_FLAGS = 0;
MotionEvent event = MotionEvent.obtain(when, when, action, x, y, pressure, DEFAULT_SIZE, MotionEvent event = MotionEvent.obtain(when, when, action, x, y, pressure, DEFAULT_SIZE,
DEFAULT_META_STATE, DEFAULT_PRECISION_X, DEFAULT_PRECISION_Y, DEFAULT_DEVICE_ID, DEFAULT_META_STATE, DEFAULT_PRECISION_X, DEFAULT_PRECISION_Y,
DEFAULT_EDGE_FLAGS); getInputDeviceId(inputSource), DEFAULT_EDGE_FLAGS);
event.setSource(inputSource); event.setSource(inputSource);
Log.i(TAG, "injectMotionEvent: " + event); Log.i(TAG, "injectMotionEvent: " + event);
InputManager.getInstance().injectInputEvent(event, InputManager.getInstance().injectInputEvent(event,