summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jay Thomas Sullivan <jaysullivan@google.com> 2022-02-25 11:40:24 -0800
committer Jay Thomas Sullivan <jaysullivan@google.com> 2022-02-25 11:40:24 -0800
commit84a5bcaefbe1878c474a39a81c6e4d76c0609220 (patch)
tree05d5a5c93844a70baa8f6ebb45f5b74ae6ba04da
parent2c51668470a06b3bac20dc85aa4d0bb66b155b7d (diff)
Don't reference Build.VERSION_CODES.TIRAMISU yet
In this case, we were comparing "less than Build.VERSION_CODES.TIRAMISU" and, since this constant is currently set to 10000, it essentially will always be true, causing a bug. Instead, reference S_V2. Test: manual Bug: 219758278 Change-Id: Ibbae666a1a40ab62b0df2b5ee2b5bfc81d2bf445
-rw-r--r--PermissionController/src/com/android/permissioncontroller/permission/ui/model/AppPermissionViewModel.kt2
1 files changed, 1 insertions, 1 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 01495aecc..45c47c39a 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/AppPermissionViewModel.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/model/AppPermissionViewModel.kt
@@ -673,7 +673,7 @@ class AppPermissionViewModel(
}
private fun expandsToStorageSupergroup(group: LightAppPermGroup): Boolean {
- return group.packageInfo.targetSdkVersion < Build.VERSION_CODES.TIRAMISU &&
+ return group.packageInfo.targetSdkVersion <= Build.VERSION_CODES.S_V2 &&
group.permGroupName in Utils.STORAGE_SUPERGROUP_PERMISSIONS
}