summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mark Kim <markvk@google.com> 2023-12-01 11:55:44 +0000
committer Mark Kim <markvk@google.com> 2023-12-01 15:06:58 +0000
commitc4417f522289e245ffea33cf1dceac2a655cb46c (patch)
treec91fd11f6a8d762383c59cb9f049918479437d87
parent65ccb6b6ddb69bf7f4893d9aee923d59b8c2ac71 (diff)
Fix failing tests related to archiving
Test: AppListRepositoryTest Bug: 313500143 Change-Id: I6a9dbeec3d761d1fb9a488e82c8514060e0b18a2
-rw-r--r--packages/SettingsLib/SpaPrivileged/tests/src/com/android/settingslib/spaprivileged/model/app/AppListRepositoryTest.kt20
1 files changed, 1 insertions, 19 deletions
diff --git a/packages/SettingsLib/SpaPrivileged/tests/src/com/android/settingslib/spaprivileged/model/app/AppListRepositoryTest.kt b/packages/SettingsLib/SpaPrivileged/tests/src/com/android/settingslib/spaprivileged/model/app/AppListRepositoryTest.kt
index 44973a743c76..f2922316dbde 100644
--- a/packages/SettingsLib/SpaPrivileged/tests/src/com/android/settingslib/spaprivileged/model/app/AppListRepositoryTest.kt
+++ b/packages/SettingsLib/SpaPrivileged/tests/src/com/android/settingslib/spaprivileged/model/app/AppListRepositoryTest.kt
@@ -126,10 +126,7 @@ class AppListRepositoryTest {
val flags = argumentCaptor<ApplicationInfoFlags> {
verify(packageManager).getInstalledApplicationsAsUser(capture(), eq(ADMIN_USER_ID))
}.firstValue
- assertThat(flags.value).isEqualTo(
- PackageManager.MATCH_DISABLED_COMPONENTS or
- PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS
- )
+ assertThat(flags.value and PackageManager.MATCH_ANY_USER.toLong()).isEqualTo(0L)
}
@Test
@@ -276,21 +273,6 @@ class AppListRepositoryTest {
}
@Test
- fun loadApps_archivedAppsDisabled() = runTest {
- mockInstalledApplications(listOf(NORMAL_APP), ADMIN_USER_ID)
- val appList = repository.loadApps(userId = ADMIN_USER_ID)
-
- assertThat(appList).containsExactly(NORMAL_APP)
- val flags = argumentCaptor<ApplicationInfoFlags> {
- verify(packageManager).getInstalledApplicationsAsUser(capture(), eq(ADMIN_USER_ID))
- }.firstValue
- assertThat(flags.value).isEqualTo(
- PackageManager.MATCH_DISABLED_COMPONENTS or
- PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS
- )
- }
-
- @Test
fun showSystemPredicate_showSystem() = runTest {
val app = SYSTEM_APP