summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chad Brubaker <cbrubaker@google.com> 2017-06-21 08:25:55 +0000
committer android-build-merger <android-build-merger@google.com> 2017-06-21 08:25:55 +0000
commit6aff0ffe8befb646f1aa46ea513e7e89701cec00 (patch)
treeb73d4012735d741e2ac9ab1fadafa7e4ab34d775
parentd1d3d0fcfc82eb5550be4660fe9cfec3b19db7db (diff)
parent53d87ebb559f8dcfa3ac04c5cdf503006f48d8a8 (diff)
Merge "Allow Instant Apps to call getPermissionControllerPackageName" into oc-dev am: 88f98985d5
am: 53d87ebb55 Change-Id: Ie0877eefee8c61c95ffa16303d56c6a448933032
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 682d6667cd87..9ea7ce73111f 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -5060,9 +5060,6 @@ public class PackageManagerService extends IPackageManager.Stub
@Override
public String getPermissionControllerPackageName() {
- if (getInstantAppPackageName(Binder.getCallingUid()) != null) {
- throw new SecurityException("Instant applications don't have access to this method");
- }
synchronized (mPackages) {
return mRequiredInstallerPackage;
}