Merge "Expose isInstantApp() to more callers"

2017-03-01 16:58:33 +00:00
parent ef1337aca2 41a0efb3ca
commit 7381e6eb21
1 changed files with 9 additions and 4 deletions
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -7312,12 +7312,17 @@ public class PackageManagerService extends IPackageManager.Stub {
            return false;
        }

-        if (!isCallerSameApp(packageName)) {
-            return false;
-        }
        synchronized (mPackages) {
            final PackageSetting ps = mSettings.mPackages.get(packageName);
-            if (ps != null) {
+            final boolean returnAllowed =
+                    ps != null
+                    && (isCallerSameApp(packageName)
+                            || mContext.checkCallingOrSelfPermission(
+                                    android.Manifest.permission.ACCESS_INSTANT_APPS)
+                                            == PERMISSION_GRANTED
+                            || mInstantAppRegistry.isInstantAccessGranted(
+                                    userId, UserHandle.getAppId(Binder.getCallingUid()), ps.appId));
+            if (returnAllowed) {
                return ps.getInstantApp(userId);
            }
        }