Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ica2ceefb59e3948e5b179333f2230c22aa721f98
This commit is contained in:
TreeHugger Robot
2021-05-19 23:21:57 +00:00
committed by Automerger Merge Worker
parent afa4a48e63 ae784dd21c
commit 885426eb94
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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}