commit b76e984536b0c7d21c4d2919cb2912e5800136f4
author Svetoslav Ganov <svetoslavganov@google.com> Thu Dec 07 17:43:52 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 07 17:43:52 2017 +0000
tree 07c4ccff17910e9b49d4f11eecb9a3c94772278a
parent 76c275e7d36159018ea3b13c849937eace40d96a
parent 9e0d3de2efed9bded6eee25b9f472a9363148f94

Merge "Use correct user id for permission check for instant foreground service"

services/core/java/com/android/server/am/ActiveServices.java

diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index 90ad8a5..9d823a7 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -1043,8 +1043,8 @@
                         try {
                             if (AppGlobals.getPackageManager().checkPermission(
                                     android.Manifest.permission.INSTANT_APP_FOREGROUND_SERVICE,
-                                    r.appInfo.packageName,
-                                    r.appInfo.uid) != PackageManager.PERMISSION_GRANTED) {
+                                    r.appInfo.packageName, UserHandle.getUserId(r.appInfo.uid))
+                                            != PackageManager.PERMISSION_GRANTED) {
                                 throw new SecurityException("Instant app " + r.appInfo.packageName
                                         + " does not have permission to create foreground"
                                         + "services");