From: Atanas Kirilov <akirilov@google.com>
Date: Fri, 28 Sep 2018 20:22:08 +0000 (+0000)
Subject: RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id... 
X-Git-Tag: android-x86-8.1-r1^2~1^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fbff0c719009acb45bfb512d2a23299b2716c8d2;p=android-x86%2Fframeworks-base.git

RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."

This reverts commit 05dc947c63a2304adce53a0aef6b0e0a9db9343a.

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

Change-Id: Id667b1c4d1a1af27837f553d7461283b22e5e41f
(cherry picked from commit bb4dcd1099cac4e0b3602e3d2ac088b796df3691)
---

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 828984ff7c15..d6b572835950 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -284,7 +284,6 @@ import com.android.server.Watchdog;
 import com.android.server.net.NetworkPolicyManagerInternal;
 import com.android.server.pm.Installer.InstallerException;
 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.pm.dex.DexManager;
@@ -5618,10 +5617,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 a14d09ed9172..f4d2ad2c6eb0 100644
--- a/services/core/java/com/android/server/pm/PermissionsState.java
+++ b/services/core/java/com/android/server/pm/PermissionsState.java
@@ -291,14 +291,6 @@ public final class PermissionsState {
     }
 
     /**
-     * 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.
      *