diff options
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 d64a7e30b..edaea9aba 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 @@ -503,7 +503,8 @@ class PermissionUsageDetailsViewModelTest { permissionRepository, appOpUsageRepository, roleRepository, - userRepository + userRepository, + false, ) } |