commit 51a862bd13bcd46499202128fd4f2d9b764f580b
author Svetoslav <svetoslavganov@google.com> Thu Sep 04 00:42:16 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 04 00:42:16 2014 +0000
tree 429ae0864315d972e2bca11ddf31bf3ac649052f
parent 0397584a1ccb4d76c5a7ceced6445e162e98d3c6
parent ebb20e0f87b0e409f754f6ecdd9a0c499b735103

am 666d5fdc: am d370dcc7: Merge "Clear binder identity when sending window change accessibility events." into lmp-dev

* commit '666d5fdcff7ef139ce1f6fdcfbe25502cf9defdf':
  Clear binder identity when sending window change accessibility events.

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index 5d13fed..a43a2a6 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -3484,11 +3484,16 @@
         }
 
         private void notifyWindowsChanged() {
-            // Let the client know the windows changed.
-            AccessibilityEvent event = AccessibilityEvent.obtain(
-                    AccessibilityEvent.TYPE_WINDOWS_CHANGED);
-            event.setEventTime(SystemClock.uptimeMillis());
-            sendAccessibilityEvent(event, mCurrentUserId);
+            final long identity = Binder.clearCallingIdentity();
+            try {
+                // Let the client know the windows changed.
+                AccessibilityEvent event = AccessibilityEvent.obtain(
+                        AccessibilityEvent.TYPE_WINDOWS_CHANGED);
+                event.setEventTime(SystemClock.uptimeMillis());
+                sendAccessibilityEvent(event, mCurrentUserId);
+            } finally {
+                Binder.restoreCallingIdentity(identity);
+            }
         }
 
         public boolean canGetAccessibilityNodeInfoLocked(Service service, int windowId) {