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

Merge "Clean up accessibility gestures." into nyc-dev

Browse Source
This commit is contained in:
Phil Weaver
2016-02-09 01:00:17 +00:00
committed by Android (Google) Code Review
parent 8ec0c5eb13 78d2e2ddf0
commit bdadd644a8
3 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/accessibilityservice/AccessibilityService.java
View File

@@ -624,8 +624,7 @@ public abstract class AccessibilityService extends Service {
gesture, 100);
try {
synchronized (mLock) {
connection.sendMotionEvents(++mGestureStatusCallbackSequence,
new ParceledListSlice<>(events));
mGestureStatusCallbackSequence++;
if (callback != null) {
if (mGestureStatusCallbackInfos == null) {
mGestureStatusCallbackInfos = new SparseArray<>();
@@ -634,6 +633,8 @@ public abstract class AccessibilityService extends Service {
callback, handler);
mGestureStatusCallbackInfos.put(mGestureStatusCallbackSequence, callbackInfo);
}
connection.sendMotionEvents(mGestureStatusCallbackSequence,
new ParceledListSlice<>(events));
}
} catch (RemoteException re) {
throw new RuntimeException(re);

4
services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java
View File

@@ -200,10 +200,6 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo
}
}
public MotionEventInjector getMotionEventInjector() {
return mMotionEventInjector;
}
/**
* Gets current event stream state associated with an input event.
* @return The event stream state that should be used for the event. Null if the event should

28
services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@@ -129,6 +129,10 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
private static final int WAIT_WINDOWS_TIMEOUT_MILLIS = 5000;
// TODO: Restructure service initialization so services aren't connected before all of
// their capabilities are ready.
private static final int WAIT_MOTION_INJECTOR_TIMEOUT_MILLIS = 1000;
private static final String FUNCTION_REGISTER_UI_TEST_AUTOMATION_SERVICE =
"registerUiTestAutomationService";
@@ -794,6 +798,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
void setMotionEventInjector(MotionEventInjector motionEventInjector) {
synchronized (mLock) {
mMotionEventInjector = motionEventInjector;
// We may be waiting on this object being set
mLock.notifyAll();
}
}
@@ -2655,10 +2661,24 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
@Override
public void sendMotionEvents(int sequence, ParceledListSlice events) {
synchronized (mLock) {
if (mSecurityPolicy.canPerformGestures(this) && (mMotionEventInjector != null)) {
mMotionEventInjector.injectEvents((List<MotionEvent>) events.getList(),
mServiceInterface, sequence);
return;
if (mSecurityPolicy.canPerformGestures(this)) {
final long endMillis =
SystemClock.uptimeMillis() + WAIT_MOTION_INJECTOR_TIMEOUT_MILLIS;
while ((mMotionEventInjector == null)
&& (SystemClock.uptimeMillis() < endMillis)) {
try {
mLock.wait(endMillis - SystemClock.uptimeMillis());
} catch (InterruptedException ie) {
/* ignore */
}
}
if (mMotionEventInjector != null) {
mMotionEventInjector.injectEvents((List<MotionEvent>) events.getList(),
mServiceInterface, sequence);
return;
} else {
Slog.e(LOG_TAG, "MotionEventInjector installation timed out");
}
}
}
try {