Merge "Perform an action in AccessibilityManagerSerivce using wrong process id." into jb-dev

sganov · Android (Google) Code Review · commit 64a03875897a · 2012-05-22T18:26:44.000-07:00
diff --git a/services/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -1412,11 +1412,11 @@ public boolean performAccessibilityAction(int accessibilityWindowId,
                     }
                 }
             }
+            final int flags = (mIncludeNotImportantViews) ?
+                    AccessibilityNodeInfo.INCLUDE_NOT_IMPORTANT_VIEWS : 0;
+            final int interrogatingPid = Binder.getCallingPid();
             final long identityToken = Binder.clearCallingIdentity();
             try {
-                final int flags = (mIncludeNotImportantViews) ?
-                        AccessibilityNodeInfo.INCLUDE_NOT_IMPORTANT_VIEWS : 0;
-                final int interrogatingPid = Binder.getCallingPid();
                 connection.performAccessibilityAction(accessibilityNodeId, action, arguments,
                         interactionId, callback, flags, interrogatingPid, interrogatingTid);
             } catch (RemoteException re) {

Original file line number	Diff line number	Diff line change
`@@ -1412,11 +1412,11 @@ public boolean performAccessibilityAction(int accessibilityWindowId,`
`1412`	`1412`	`}`
`1413`	`1413`	`}`
`1414`	`1414`	`}`
	`1415`	`+ final int flags = (mIncludeNotImportantViews) ?`
	`1416`	`+ AccessibilityNodeInfo.INCLUDE_NOT_IMPORTANT_VIEWS : 0;`
	`1417`	`+ final int interrogatingPid = Binder.getCallingPid();`
`1415`	`1418`	`final long identityToken = Binder.clearCallingIdentity();`
`1416`	`1419`	`try {`
`1417`		`- final int flags = (mIncludeNotImportantViews) ?`
`1418`		`- AccessibilityNodeInfo.INCLUDE_NOT_IMPORTANT_VIEWS : 0;`
`1419`		`- final int interrogatingPid = Binder.getCallingPid();`
`1420`	`1420`	`connection.performAccessibilityAction(accessibilityNodeId, action, arguments,`
`1421`	`1421`	`interactionId, callback, flags, interrogatingPid, interrogatingTid);`
`1422`	`1422`	`} catch (RemoteException re) {`