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

Commit ae784dd2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix parsing equivalence for new permissions flag" into sc-dev am: 328d2d56 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14552282

Change-Id: I238564ba04d1f419a798ffb031f5223d23d9ff68
parents 8b8a9097 328d2d56

services/tests/servicestests/src/com/android/server/pm/parsing/AndroidPackageParsingTestBase.kt

+7 −1
Original line number Diff line number Diff line
@@ -509,7 +509,13 @@ open class AndroidPackageParsingTestBase { 
            .ignored("Checked separately in test")}

            reqFeatures=${this.reqFeatures?.joinToString { it.dumpToString() }}

            requestedPermissions=${this.requestedPermissions?.contentToString()}

            requestedPermissionsFlags=${this.requestedPermissionsFlags?.contentToString()}

            requestedPermissionsFlags=${

                this.requestedPermissionsFlags?.map {

                    // Newer flags are stripped

                    it and (PackageInfo.REQUESTED_PERMISSION_REQUIRED

                            or PackageInfo.REQUESTED_PERMISSION_GRANTED)

                }?.joinToString()

            }

            requiredAccountType=${this.requiredAccountType}

            requiredForAllUsers=${this.requiredForAllUsers}

            restrictedAccountType=${this.restrictedAccountType}