Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2eaf8488 authored by Sam Dubey's avatar Sam Dubey Committed by Android (Google) Code Review
Browse files

Revert "Update signature permissions when package signing is changed." 

This reverts commit 88c2406e.

Reason for revert: Potentially causing b/290420792, will verify 

Change-Id: I814c843f0e92b9dab0ea3f33e8815d1153882fd3
parent 88c2406e

services/permission/java/com/android/server/permission/access/permission/AppIdPermissionPolicy.kt

+2 −9
Original line number Diff line number Diff line
@@ -390,14 +390,7 @@ class AppIdPermissionPolicy : SchemePolicy() { 
        packageState: PackageState,

        changedPermissionNames: MutableIndexedSet<String>

    ) {

        val androidPackage = packageState.androidPackage!!

        // This may not be the same package as the old permission because the old permission owner

        // can be different, hence using this somewhat strange name to prevent misuse.

        val oldNewPackage = oldState.externalState.packageStates[packageState.packageName]

            ?.androidPackage

        val isPackageSigningChanged = oldNewPackage != null &&

                androidPackage.signingDetails != oldNewPackage.signingDetails

        androidPackage.permissions.forEachIndexed { _, parsedPermission ->

        packageState.androidPackage!!.permissions.forEachIndexed { _, parsedPermission ->

            val newPermissionInfo = PackageInfoUtils.generatePermissionInfo(

                parsedPermission, PackageManager.GET_META_DATA.toLong()

            )!!
@@ -527,7 +520,7 @@ class AppIdPermissionPolicy : SchemePolicy() { 
                    newPackageName != oldPermission.packageName ||

                    newPermission.protectionLevel != oldPermission.protectionLevel || (

                        oldPermission.isReconciled && (

                            (newPermission.isSignature && isPackageSigningChanged) || (

                            (

                                newPermission.isKnownSigner &&

                                    newPermission.knownCerts != oldPermission.knownCerts

                            ) || (