diff options
| author | Jay Sullivan <jaysullivan@google.com> | 2022-06-30 22:01:15 +0000 |
|---|---|---|
| committer | Jay Sullivan <jaysullivan@google.com> | 2022-06-30 22:02:58 +0000 |
| commit | 45100a40cbda2f3895d901aea38bdb2c4219d856 (patch) | |
| tree | 1091d74945c575f77d862d986c4fe03cffbab21f /PermissionController/src/com/android/permissioncontroller/permission/ui/model/AppPermissionViewModel.kt | |
| parent | b2bc963f02d4bab593e10f8c615c8ccecc0a56f5 (diff) | |
| download | Permission-45100a40cbda2f3895d901aea38bdb2c4219d856.tar.gz | |
Fix SDK annotations in AppPermissionViewModel
showMediaConfirmDialog() should be annotated with @RequiresApi instead
of @ChecksSdkIntAtLeast. It's not checking SDK int internally, and
requires the caller to check it.
expandsToStorageSupergroup() can be annotated with @ChecksSdkIntAtLeast
because Utils.STORAGE_SUPERGROUP_PERMISSIONS is only non-empty on T+.
Fix: 234775341
Test: presubmit
Change-Id: I04c2ee59b7e8519e8733ae9103234ab146295829
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 | 4 |
1 files changed, 3 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 a91ecf8f3..51c18fe6b 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/AppPermissionViewModel.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/model/AppPermissionViewModel.kt @@ -32,6 +32,7 @@ import android.os.Bundle import android.os.UserHandle import android.util.Log import androidx.annotation.ChecksSdkIntAtLeast +import androidx.annotation.RequiresApi import androidx.annotation.StringRes import androidx.fragment.app.Fragment import androidx.lifecycle.MutableLiveData @@ -689,6 +690,7 @@ 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 @@ -704,7 +706,7 @@ class AppPermissionViewModel( } } - @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.TIRAMISU) + @RequiresApi(Build.VERSION_CODES.TIRAMISU) private fun showMediaConfirmDialog( setOneTime: Boolean, confirmDialog: ConfirmDialogShowingFragment, |