diff options
| author | Nate Myren <ntmyren@google.com> | 2022-09-09 15:30:52 -0700 |
|---|---|---|
| committer | Nate Myren <ntmyren@google.com> | 2022-09-12 10:17:12 -0700 |
| commit | 1b713012517fc77ef9f919d214417e7fdb6ac044 (patch) | |
| tree | 611e736973aa153112c554c86df148368b96ffb6 /PermissionController/src/com/android/permissioncontroller/permission/ui/model/AppPermissionViewModel.kt | |
| parent | 84bc493c4f3fc08d3b9160e8dc4f6188d8ccb255 (diff) | |
| download | Permission-1b713012517fc77ef9f919d214417e7fdb6ac044.tar.gz | |
Create PermissionMapping file
This file moves the mapping of permission -> permission group, and the
related static methods, out of the Utils file, into its own dedicated
space.
Fixes: 245998668
Test: Build, Presubmit
Change-Id: I36cc573b34c3303a26d3e48ced46c1d0615e0f05
Diffstat (limited to 'PermissionController/src/com/android/permissioncontroller/permission/ui/model/AppPermissionViewModel.kt')
| -rw-r--r-- | PermissionController/src/com/android/permissioncontroller/permission/ui/model/AppPermissionViewModel.kt | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/AppPermissionViewModel.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/model/AppPermissionViewModel.kt index 51c18fe6b..2be01d674 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/AppPermissionViewModel.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/model/AppPermissionViewModel.kt @@ -44,6 +44,7 @@ import com.android.permissioncontroller.PermissionControllerStatsLog import com.android.permissioncontroller.PermissionControllerStatsLog.APP_PERMISSION_FRAGMENT_ACTION_REPORTED import com.android.permissioncontroller.PermissionControllerStatsLog.APP_PERMISSION_FRAGMENT_VIEWED import com.android.permissioncontroller.R +import com.android.permissioncontroller.permission.utils.PermissionMapping import com.android.permissioncontroller.permission.data.FullStoragePermissionAppsLiveData import com.android.permissioncontroller.permission.data.FullStoragePermissionAppsLiveData.FullStoragePackageState import com.android.permissioncontroller.permission.data.LightAppPermGroupLiveData @@ -211,7 +212,7 @@ class AppPermissionViewModel( addSource(appPermGroupLiveData) { appPermGroup -> lightAppPermGroup = appPermGroup - if (permGroupName in Utils.STORAGE_SUPERGROUP_PERMISSIONS) { + if (permGroupName in PermissionMapping.STORAGE_SUPERGROUP_PERMISSIONS) { onMediaPermGroupUpdate(permGroupName, appPermGroup) } if (appPermGroupLiveData.isInitialized && appPermGroup == null) { @@ -233,8 +234,8 @@ class AppPermissionViewModel( } } - if (permGroupName in Utils.STORAGE_SUPERGROUP_PERMISSIONS) { - for (permGroupName in Utils.STORAGE_SUPERGROUP_PERMISSIONS) { + if (permGroupName in PermissionMapping.STORAGE_SUPERGROUP_PERMISSIONS) { + for (permGroupName in PermissionMapping.STORAGE_SUPERGROUP_PERMISSIONS) { val liveData = LightAppPermGroupLiveData[packageName, permGroupName, user] mediaStorageSupergroupLiveData[permGroupName] = liveData } @@ -276,7 +277,7 @@ class AppPermissionViewModel( val deniedForegroundState = ButtonState() askOneTimeState.isShown = group.foreground.isGranted && group.isOneTime - askState.isShown = Utils.supportsOneTimeGrant(permGroupName) && + askState.isShown = PermissionMapping.supportsOneTimeGrant(permGroupName) && !(group.foreground.isGranted && group.isOneTime) deniedState.isShown = true @@ -693,11 +694,11 @@ class AppPermissionViewModel( @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.TIRAMISU) private fun expandsToStorageSupergroup(group: LightAppPermGroup): Boolean { return group.packageInfo.targetSdkVersion <= Build.VERSION_CODES.S_V2 && - group.permGroupName in Utils.STORAGE_SUPERGROUP_PERMISSIONS + group.permGroupName in PermissionMapping.STORAGE_SUPERGROUP_PERMISSIONS } private fun expandToSupergroup(group: LightAppPermGroup): List<LightAppPermGroup> { - val mediaSupergroup = Utils.STORAGE_SUPERGROUP_PERMISSIONS + val mediaSupergroup = PermissionMapping.STORAGE_SUPERGROUP_PERMISSIONS .mapNotNull { mediaStorageSupergroupPermGroups[it] } return if (expandsToStorageSupergroup(group)) { mediaSupergroup |