commit 9f1885dee8fe5cbce8f7150ab8b26df6d363ac34
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 06 23:35:13 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 06 23:35:13 2018 +0000
tree f3f3515d66644c2b9e18f477e118be72a2a4aff6
parent 125c19a2f53c311270fd0bca8f5fe511054ba242
parent 82d3041f30818c605cca2a41861a77d58aafae3c

Merge "DO NOT MERGE Fix security exception due to incorrect flags" into pi-dev

services/usage/java/com/android/server/usage/UsageStatsService.java

diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java
index a7d3f78..e6584c5 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 @@
             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);