summaryrefslogtreecommitdiff
path: root/PermissionController
diff options
context:
space:
mode:
author mrulhania <mrulhania@google.com> 2024-10-18 12:39:23 -0700
committer mrulhania <mrulhania@google.com> 2024-10-18 12:43:53 -0700
commitb29ff293dd433d9689766547be5f6bc1864781fa (patch)
tree7de67e87a65b979bcd7191d84f34a1840e383707 /PermissionController
parent07cf2c314da63b903ade9c972f90b6b3c625579a (diff)
Inject device config parameter for tests
On T- platform READ_DEVICE_CONFIG permission check is enforced, the check was removed in ag/24226148. Test: atest PermissionUsageDetailsViewModelTest GetPermissionGroupUsageDetailsUseCaseTest Fix: 374041578 Flag: EXEMPT bug fix Relnote: N/A Change-Id: I96622f678fddf74f28365696829a7f1d7a484ef1
Diffstat (limited to 'PermissionController')
-rw-r--r--PermissionController/src/com/android/permissioncontroller/permission/domain/usecase/v31/GetPermissionGroupUsageDetailsUseCase.kt5
-rw-r--r--PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/domain/usecase/GetPermissionGroupUsageDetailsUseCaseTest.kt3
-rw-r--r--PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/ui/model/PermissionUsageDetailsViewModelTest.kt3
3 files changed, 9 insertions, 2 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/domain/usecase/v31/GetPermissionGroupUsageDetailsUseCase.kt b/PermissionController/src/com/android/permissioncontroller/permission/domain/usecase/v31/GetPermissionGroupUsageDetailsUseCase.kt
index edf6e22e5..5ba649fd3 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/domain/usecase/v31/GetPermissionGroupUsageDetailsUseCase.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/domain/usecase/v31/GetPermissionGroupUsageDetailsUseCase.kt
@@ -50,6 +50,9 @@ class GetPermissionGroupUsageDetailsUseCase(
private val appOpRepository: AppOpRepository,
private val roleRepository: RoleRepository,
private val userRepository: UserRepository,
+ // Allow tests to inject as on T- READ_DEVICE_CONFIG permission check is enforced.
+ private val attributionLabelFix: Boolean =
+ com.android.permission.flags.Flags.permissionTimelineAttributionLabelFix(),
) {
operator fun invoke(coroutineScope: CoroutineScope): Flow<PermissionTimelineUsageModelWrapper> {
val opNames = requireNotNull(permissionGroupToOpNames[permissionGroup])
@@ -90,7 +93,7 @@ class GetPermissionGroupUsageDetailsUseCase(
// show attribution on T+ for location provider only..
private fun shouldShowAttributionLabel(packageName: String): Boolean {
- return if (com.android.permission.flags.Flags.permissionTimelineAttributionLabelFix()) {
+ return if (attributionLabelFix) {
SdkLevel.isAtLeastT() &&
LocationUtils.isLocationProvider(PermissionControllerApplication.get(), packageName)
} else true
diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/domain/usecase/GetPermissionGroupUsageDetailsUseCaseTest.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/domain/usecase/GetPermissionGroupUsageDetailsUseCaseTest.kt
index ee25a2569..e6a1c15c2 100644
--- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/domain/usecase/GetPermissionGroupUsageDetailsUseCaseTest.kt
+++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/domain/usecase/GetPermissionGroupUsageDetailsUseCaseTest.kt
@@ -756,6 +756,7 @@ class GetPermissionGroupUsageDetailsUseCaseTest {
LOCATION_PERMISSION_GROUP,
discretePackageOps,
packageRepository = FakePackageRepository(packageInfos, packageAttributions),
+ attributionLabelFix = true,
)
val permissionTimelineUsages = getResult(underTest, this)
@@ -906,6 +907,7 @@ class GetPermissionGroupUsageDetailsUseCaseTest {
permissionFlags: Map<String, Int> = emptyMap(),
userRepository: UserRepository = FakeUserRepository(listOf(currentUser.identifier)),
packageRepository: PackageRepository = FakePackageRepository(packageInfos),
+ attributionLabelFix: Boolean = false,
): GetPermissionGroupUsageDetailsUseCase {
val permissionRepository = FakePermissionRepository(permissionFlags)
val appOpUsageRepository = FakeAppOpRepository(emptyFlow(), discreteUsageFlow)
@@ -917,6 +919,7 @@ class GetPermissionGroupUsageDetailsUseCaseTest {
appOpUsageRepository,
roleRepository,
userRepository,
+ attributionLabelFix,
)
}
diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/ui/model/PermissionUsageDetailsViewModelTest.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/ui/model/PermissionUsageDetailsViewModelTest.kt
index 31e81e588..06292ce8b 100644
--- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/ui/model/PermissionUsageDetailsViewModelTest.kt
+++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/ui/model/PermissionUsageDetailsViewModelTest.kt
@@ -500,7 +500,8 @@ class PermissionUsageDetailsViewModelTest {
permissionRepository,
appOpUsageRepository,
roleRepository,
- userRepository
+ userRepository,
+ false,
)
}