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

am b7726159: Merge "Crash in the touch explorer." into jb-dev

Browse Source 
* commit 'b7726159e3ee29b45381ede8446c1e87fbbaa23a':
  Crash in the touch explorer.
This commit is contained in:
Svetoslav Ganov
2012-06-10 10:02:40 -07:00
committed by Android Git Automerger
parent 3dbb70ec9c b7726159e3
commit 2622a7cd6e
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,6 +113,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
private static final int MSG_TOGGLE_TOUCH_EXPLORATION = 2; private static final int MSG_TOGGLE_TOUCH_EXPLORATION = 2;
private static final int MSG_SEND_ACCESSIBILITY_EVENT_TO_INPUT_FILTER = 3;
private static int sIdCounter = 0; private static int sIdCounter = 0;
private static int sNextWindowId; private static int sNextWindowId;
@@ -402,7 +404,9 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
notifyAccessibilityServicesDelayedLocked(event, true); notifyAccessibilityServicesDelayedLocked(event, true);
} }
if (mHasInputFilter && mInputFilter != null) { if (mHasInputFilter && mInputFilter != null) {
mInputFilter.onAccessibilityEvent(event); mMainHandler.obtainMessage(MSG_SEND_ACCESSIBILITY_EVENT_TO_INPUT_FILTER,
AccessibilityEvent.obtain(event)).sendToTarget();
} }
event.recycle(); event.recycle();
mHandledFeedbackTypes = 0; mHandledFeedbackTypes = 0;
@@ -1104,7 +1108,14 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
mEnableTouchExplorationDialog.setCanceledOnTouchOutside(true); mEnableTouchExplorationDialog.setCanceledOnTouchOutside(true);
mEnableTouchExplorationDialog.show(); mEnableTouchExplorationDialog.show();
} }
} } break;
case MSG_SEND_ACCESSIBILITY_EVENT_TO_INPUT_FILTER: {
AccessibilityEvent event = (AccessibilityEvent) msg.obj;
if (mHasInputFilter && mInputFilter != null) {
mInputFilter.onAccessibilityEvent(event);
}
event.recycle();
} break;
} }
} }
} }