From a2747c93521069600d012d9da81044e80aa06cce Mon Sep 17 00:00:00 2001
From: Hai Zhang <zhanghai@google.com>
Date: Wed, 12 Aug 2020 16:22:08 -0700
Subject: [PATCH] Don't return non-instant permissions as granted in
 PackageInfo for instant apps.

Bug: 140256621
Test: atest EphemeralTest
Change-Id: I778f9311211232bc5e785229505e5b509e8d4aa8
---
 .../permission/PermissionManagerService.java  | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
index 3d1570476b482..617188e33d60f 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -2464,7 +2464,28 @@ public class PermissionManagerService extends IPermissionManager.Stub {
             return null;
         }
         final PermissionsState permissionsState = ps.getPermissionsState();
-        return permissionsState.getPermissions(userId);
+        if (!ps.getInstantApp(userId)) {
+            return permissionsState.getPermissions(userId);
+        } else {
+            // Install permission state is shared among all users, but instant app state is
+            // per-user, so we can only filter it here unless we make install permission state
+            // per-user as well.
+            final Set<String> instantPermissions = new ArraySet<>(permissionsState.getPermissions(
+                    userId));
+            instantPermissions.removeIf(permissionName -> {
+                BasePermission permission = mSettings.getPermission(permissionName);
+                if (permission == null) {
+                    return true;
+                }
+                if (!permission.isInstant()) {
+                    EventLog.writeEvent(0x534e4554, "140256621", UserHandle.getUid(userId,
+                            ps.getAppId()), permissionName);
+                    return true;
+                }
+                return false;
+            });
+            return instantPermissions;
+        }
     }
 
     @Nullable