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

Fix preserving app links user selection on package update

Browse Source 
The wrong set of domains was being used for domain retainment during
migration. A test was added to check both verified and selected state
preservation on update.

Test: atest DomainVerificationPackageTest#migratePackageSelected

Bug: 205009465

Merged-In: I2c864a34f356e32948cbc4e5d249e12c691a5726
Change-Id: I2c864a34f356e32948cbc4e5d249e12c691a5726
This commit is contained in:
Winson
2021-11-08 17:58:45 -08:00
committed by Winson Chiu
parent 539da553b6
commit 87a549d918
2 changed files with 72 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/verify/domain/DomainVerificationService.java
View File

@@ -896,7 +896,7 @@ public class DomainVerificationService extends SystemService
oldPkgState.getUserStates();
int oldUserStatesSize = oldUserStates.size();
if (oldUserStatesSize > 0) {
ArraySet<String> newWebDomains = mCollector.collectValidAutoVerifyDomains(newPkg);
ArraySet<String> newWebDomains = mCollector.collectAllWebDomains(newPkg);
for (int oldUserStatesIndex = 0; oldUserStatesIndex < oldUserStatesSize;
oldUserStatesIndex++) {
int userId = oldUserStates.keyAt(oldUserStatesIndex);

85
services/tests/PackageManagerServiceTests/unit/src/com/android/server/pm/test/verify/domain/DomainVerificationPackageTest.kt
View File

@@ -617,6 +617,60 @@ class DomainVerificationPackageTest {
assertThat(service.queryValidVerificationPackageNames()).containsExactly(pkgName)
}
@Test
fun migratePackageSelected() {
val pkgName = PKG_ONE
val pkgBefore = mockPkgSetting(pkgName, UUID_ONE, SIGNATURE_ONE,
listOf(DOMAIN_1), listOf(DOMAIN_2))
val pkgAfter = mockPkgSetting(pkgName, UUID_TWO, SIGNATURE_TWO,
listOf(DOMAIN_1), listOf(DOMAIN_2))
val map = mutableMapOf<String, PackageSetting>()
val service = makeService { map[it] }
service.addPackage(pkgBefore)
// Only insert the package after addPackage call to ensure the service doesn't access
// a live package inside the addPackage logic. It should only use the provided input.
map[pkgName] = pkgBefore
assertThat(service.setStatus(UUID_ONE, setOf(DOMAIN_1), STATE_SUCCESS))
.isEqualTo(DomainVerificationManager.STATUS_OK)
assertThat(service.setUserSelection(UUID_ONE, setOf(DOMAIN_2), true, USER_ID))
.isEqualTo(DomainVerificationManager.STATUS_OK)
service.getInfo(pkgName).run {
assertThat(identifier).isEqualTo(UUID_ONE)
assertThat(hostToStateMap).containsExactlyEntriesIn(mapOf(
DOMAIN_1 to STATE_SUCCESS,
))
}
assertThat(service.getUserState(pkgName).hostToStateMap).containsExactlyEntriesIn(mapOf(
DOMAIN_1 to DOMAIN_STATE_VERIFIED,
DOMAIN_2 to DOMAIN_STATE_SELECTED,
))
assertThat(service.queryValidVerificationPackageNames()).containsExactly(pkgName)
// Now remove the package because migrateState shouldn't use it either
map.remove(pkgName)
service.migrateState(pkgBefore, pkgAfter)
map[pkgName] = pkgAfter
service.getInfo(pkgName).run {
assertThat(identifier).isEqualTo(UUID_TWO)
assertThat(hostToStateMap).containsExactlyEntriesIn(mapOf(
DOMAIN_1 to STATE_SUCCESS,
))
}
assertThat(service.getUserState(pkgName).hostToStateMap).containsExactlyEntriesIn(mapOf(
DOMAIN_1 to DOMAIN_STATE_VERIFIED,
DOMAIN_2 to DOMAIN_STATE_SELECTED,
))
assertThat(service.queryValidVerificationPackageNames()).containsExactly(pkgName)
}
@Test
fun backupAndRestore() {
// This test acts as a proxy for true user restore through PackageManager,
@@ -798,7 +852,8 @@ class DomainVerificationPackageTest {
pkgName: String,
domainSetId: UUID,
signature: String,
domains: List<String> = listOf(DOMAIN_1, DOMAIN_2),
autoVerifyDomains: List<String> = listOf(DOMAIN_1, DOMAIN_2),
otherDomains: List<String> = listOf(),
isSystemApp: Boolean = false
) = mockThrowOnUnmocked<PackageSetting> {
val pkg = mockThrowOnUnmocked<AndroidPackage> {
@@ -806,21 +861,23 @@ class DomainVerificationPackageTest {
whenever(targetSdkVersion) { Build.VERSION_CODES.S }
whenever(isEnabled) { true }
fun baseIntent(domain: String) = ParsedIntentInfo().apply {
addAction(Intent.ACTION_VIEW)
addCategory(Intent.CATEGORY_BROWSABLE)
addCategory(Intent.CATEGORY_DEFAULT)
addDataScheme("http")
addDataScheme("https")
addDataPath("/sub", PatternMatcher.PATTERN_LITERAL)
addDataAuthority(domain, null)
}
val activityList = listOf(
ParsedActivity().apply {
domains.forEach {
addIntent(
ParsedIntentInfo().apply {
autoVerify = true
addAction(Intent.ACTION_VIEW)
addCategory(Intent.CATEGORY_BROWSABLE)
addCategory(Intent.CATEGORY_DEFAULT)
addDataScheme("http")
addDataScheme("https")
addDataPath("/sub", PatternMatcher.PATTERN_LITERAL)
addDataAuthority(it, null)
}
)
autoVerifyDomains.forEach {
addIntent(baseIntent(it).apply { autoVerify = true })
}
otherDomains.forEach {
addIntent(baseIntent(it).apply { autoVerify = false })
}
},
)