summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Mak <tonymak@google.com>2017-12-14 12:40:07 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-08-03 19:05:19 +0000
commit51f7f6bd1f064450bf5e8bc6e0fe74f44927ae38 (patch)
tree05d306c1a05921d9608495bd7aad03dc4a739ccd
parent959db062fb72575322b3349170a2b523049e1d07 (diff)
downloadbase-51f7f6bd1f064450bf5e8bc6e0fe74f44927ae38.tar.gz
clearCallingIdentity before calling into getPackageUidAsUser
Fix: 70585244 Bug: 69981755 Test: Enable any accessibility service -> inflate work profile -> Tap on any work app -> no longer crash Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.CrossProfileAppsHostSideTest.testPrimaryUserToManagedProfile Change-Id: I80d18f4e2ab76a228cb0aa2c8312c323a9b5c84d (cherry picked from commit 857326e3731939f6ec7979e1d86585bf0ea484f4)
-rw-r--r--services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index d0d65d94fb5b..8b4076af7759 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -4566,11 +4566,14 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
}
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);
}
}