Merge "Fix parsing equivalence for new permissions flag" into sc-dev

2021-05-17 18:02:48 +00:00
parent 4e04b705e3 60c54e0cce
commit 328d2d56b6
1 changed files with 7 additions and 1 deletions
--- a/services/tests/servicestests/src/com/android/server/pm/parsing/AndroidPackageParsingTestBase.kt
+++ b/services/tests/servicestests/src/com/android/server/pm/parsing/AndroidPackageParsingTestBase.kt
@@ -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}