diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-09-28 23:13:51 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-09-28 23:13:51 +0000 |
| commit | f9cc11e67404de650a8a03f884b55493f43ff307 (patch) | |
| tree | c50dc190d341f81d26304bce9d16b69b846454ee | |
| parent | bde102fb439b71a1bb56a1cacb3f843db71c9612 (diff) | |
| parent | 1219e3774b68e214987c1d0d7f3d968e0d2b5cba (diff) | |
| download | base-android-8.1.0_r50.tar.gz | |
Merge cherrypicks of [5142118] into oc-m7-releaseandroid-8.1.0_r50
Change-Id: Ida047fe37543c6cedb5bd8fcea026f05afea46b5
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 5 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/PermissionsState.java | 8 |
2 files changed, 1 insertions, 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 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. * |