From 999e3fe9862be1122505ebdcccef7c3c26817995 Mon Sep 17 00:00:00 2001
From: Atanas Kirilov <akirilov@google.com>
Date: Fri, 28 Sep 2018 20:21:54 +0000
Subject: [PATCH] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both
 self and shared user id package for requested permissions."

This reverts commit 8da6786608e374c20ae584b1c404fd4894786e46.

Reason for revert: Not a security fix and the security fix needs this cl is reverted.
Bug: 114365189

Change-Id: I1826a5b6889f21fbbe16311a3da66c93e26383f3
---
 .../java/com/android/server/pm/PackageManagerService.java | 5 +----
 .../core/java/com/android/server/pm/PermissionsState.java | 8 --------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 1b1161d93abaf..8c5f196a4f798 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -250,7 +250,6 @@ import com.android.server.SystemConfig;
 import com.android.server.Watchdog;
 import com.android.server.net.NetworkPolicyManagerInternal;
 import com.android.server.pm.PermissionsState.PermissionState;
-import com.android.server.pm.PackageSetting;
 import com.android.server.pm.Settings.DatabaseVersion;
 import com.android.server.pm.Settings.VersionInfo;
 import com.android.server.storage.DeviceStorageMonitorInternal;
@@ -4104,10 +4103,8 @@ public class PackageManagerService extends IPackageManager.Stub {
 
     private static void enforceDeclaredAsUsedAndRuntimeOrDevelopmentPermission(PackageParser.Package pkg,
             BasePermission bp) {
-        final PackageSetting pkgSetting = (PackageSetting) pkg.mExtras;
-        final PermissionsState permsState = pkgSetting.getPermissionsState();
         int index = pkg.requestedPermissions.indexOf(bp.name);
-        if (!permsState.hasRequestedPermission(bp.name) && index == -1) {
+        if (index == -1) {
             throw new SecurityException("Package " + pkg.packageName
                     + " has not requested permission " + bp.name);
         }
diff --git a/services/core/java/com/android/server/pm/PermissionsState.java b/services/core/java/com/android/server/pm/PermissionsState.java
index f307ce2999fe0..007b73814256c 100644
--- a/services/core/java/com/android/server/pm/PermissionsState.java
+++ b/services/core/java/com/android/server/pm/PermissionsState.java
@@ -260,14 +260,6 @@ public final class PermissionsState {
         return false;
     }
 
-    /**
-     * Returns whether the state has any known request for the given permission name,
-     * whether or not it has been granted.
-     */
-    public boolean hasRequestedPermission(String name) {
-        return mPermissions != null && (mPermissions.get(name) != null);
-    }
-
     /**
      * Gets all permissions for a given device user id regardless if they
      * are install time or runtime permissions.