summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Amith Yamasani <yamasani@google.com> 2018-06-06 10:48:03 -0700
committer Amith Yamasani <yamasani@google.com> 2018-06-06 19:51:24 +0000
commit82d3041f30818c605cca2a41861a77d58aafae3c (patch)
tree857b67265b3cee53f1d1296b0f5289c93646a3e3
parentb4e4fc3a1e2cc43207a73629790757b3157687a7 (diff)
DO NOT MERGE Fix security exception due to incorrect flags
Caught by test UsageStatsTest due to stricter checks for MATCH_ANY_USER. Change-Id: Ie884c7007a8588a222773fba8d7967bcdf2a528a Fixes: 109700742 Test: atest CtsUsageStatsTestCases:UsageStatsTest
-rw-r--r--services/usage/java/com/android/server/usage/UsageStatsService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java
index a7d3f78c66f0..e6584c51ebd6 100644
--- a/services/usage/java/com/android/server/usage/UsageStatsService.java
+++ b/services/usage/java/com/android/server/usage/UsageStatsService.java
@@ -710,7 +710,7 @@ public class UsageStatsService extends SystemService implements
final int callingUid = Binder.getCallingUid();
final int callingUserId = UserHandle.getUserId(callingUid);
- if (mPackageManagerInternal.getPackageUid(pkg, PackageManager.MATCH_ANY_USER,
+ if (mPackageManagerInternal.getPackageUid(pkg, /*flags=*/ 0,
callingUserId) != callingUid) {
throw new SecurityException("Calling uid " + pkg + " cannot query events"
+ "for package " + pkg);