commit 42ded39df8838f01a9c1b46592aaf6afea6236ca
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu May 10 17:40:32 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu May 10 17:40:32 2018 +0000
tree f6950cd9acd16b7b5267daa06a8fe310aad33713
parent 9e291fe8c22b60d3d16d9dbce95d0d58e33e55f8
parent 6a42ea18b3f0ba8d5b865096b303ebf4689629c7

[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373 am: b1f2848510 am: 884d2c7360 am: 6a42ea18b3

Change-Id: If82fd8b2c76bedf089bec4501169417427854b1d

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 8a35ff8..a6808ca 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -3817,11 +3817,14 @@
         }
 
         private boolean isValidPackageForUid(String packageName, int uid) {
+            final long token = Binder.clearCallingIdentity();
             try {
                 return uid == mPackageManager.getPackageUid(
                         packageName, UserHandle.getUserId(uid));
             } catch (PackageManager.NameNotFoundException e) {
                 return false;
+            } finally {
+                Binder.restoreCallingIdentity(token);
             }
         }