diff options
| author | Karishma Vakil <kvakil@google.com> | 2023-05-08 15:43:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-05-08 15:43:58 +0000 |
| commit | 2b6b6d3807e700e0472437b3a96e6c32b474cf73 (patch) | |
| tree | c04aecbc1714dfb1a58c65cc7683be88d5795a99 /PermissionController/src/com/android/permissioncontroller/permission/service | |
| parent | 378fd7762dff020d7128dd68c2f91cd51dd0f617 (diff) | |
| parent | f6a57699d42e2a5cbc3b532b91181cefa79d246e (diff) | |
| download | Permission-2b6b6d3807e700e0472437b3a96e6c32b474cf73.tar.gz | |
Merge "[Safety Labels] Enable safety labels features for preloaded apps" into udc-dev
Diffstat (limited to 'PermissionController/src/com/android/permissioncontroller/permission/service')
| -rw-r--r-- | PermissionController/src/com/android/permissioncontroller/permission/service/v34/SafetyLabelChangesJobService.kt | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/service/v34/SafetyLabelChangesJobService.kt b/PermissionController/src/com/android/permissioncontroller/permission/service/v34/SafetyLabelChangesJobService.kt index 98c5fc975..9231dc17b 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/service/v34/SafetyLabelChangesJobService.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/service/v34/SafetyLabelChangesJobService.kt @@ -420,7 +420,7 @@ class SafetyLabelChangesJobService : JobService() { private suspend fun getAllStoreInstalledPackagesRequestingLocation(): Set<Pair<String, UserHandle>> = getAllPackagesRequestingLocation() - .filter { isStoreInstalledPackage(it) } + .filter { isSafetyLabelSupported(it) } .toSet() private suspend fun getAllPackagesRequestingLocation(): Set<Pair<String, UserHandle>> = @@ -437,12 +437,10 @@ class SafetyLabelChangesJobService : JobService() { private fun AppPermGroupUiInfo.isPermissionGranted() = permGrantState in setOf(PERMS_ALLOWED_ALWAYS, PERMS_ALLOWED_FOREGROUND_ONLY) - private suspend fun isStoreInstalledPackage( - pkg: Pair<String, UserHandle> - ): Boolean { + private suspend fun isSafetyLabelSupported(packageUser: Pair<String, UserHandle>): Boolean { val lightInstallSourceInfo = - LightInstallSourceInfoLiveData[pkg].getInitializedValue() - return lightInstallSourceInfo.isStoreInstalled() + LightInstallSourceInfoLiveData[packageUser].getInitializedValue() + return lightInstallSourceInfo.supportsSafetyLabel } private suspend fun postSafetyLabelChangedNotification() { |