diff options
| author | 2024-04-10 19:31:34 +0000 | |
|---|---|---|
| committer | 2024-04-10 19:31:34 +0000 | |
| commit | cc522f4abe572f228a3ff0179f7e9cf9b5f064fc (patch) | |
| tree | 54a15f358c0ea29f9b60f026e3eb8b8449029f9f | |
| parent | ed29ac1a1bcbf26c26c518e8c425cfcc100f577e (diff) | |
| parent | aaf326425e8ab5bbd0f13a51eb7f07ba6c5b057b (diff) | |
Merge "[ECM] Use ChecksSdkIntAtLeast(V), try #2" into main
| -rw-r--r-- | PermissionController/src/com/android/permissioncontroller/ecm/EnhancedConfirmationDialogActivity.kt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/ecm/EnhancedConfirmationDialogActivity.kt b/PermissionController/src/com/android/permissioncontroller/ecm/EnhancedConfirmationDialogActivity.kt index 1aae1253a..e813b782a 100644 --- a/PermissionController/src/com/android/permissioncontroller/ecm/EnhancedConfirmationDialogActivity.kt +++ b/PermissionController/src/com/android/permissioncontroller/ecm/EnhancedConfirmationDialogActivity.kt @@ -34,7 +34,6 @@ import android.text.method.LinkMovementMethod import android.view.LayoutInflater import android.view.View import android.widget.TextView -import androidx.annotation.ChecksSdkIntAtLeast import androidx.annotation.Keep import androidx.annotation.RequiresApi import androidx.fragment.app.DialogFragment @@ -49,6 +48,7 @@ import com.android.permissioncontroller.permission.utils.Utils import com.android.role.controller.model.Roles @Keep +@RequiresApi(Build.VERSION_CODES.VANILLA_ICE_CREAM) class EnhancedConfirmationDialogActivity : FragmentActivity() { companion object { private const val KEY_WAS_CLEAR_RESTRICTION_ALLOWED = "KEY_WAS_CLEAR_RESTRICTION_ALLOWED" @@ -57,7 +57,6 @@ class EnhancedConfirmationDialogActivity : FragmentActivity() { private var wasClearRestrictionAllowed: Boolean = false private var dialogResult: DialogResult = DialogResult.Cancelled - @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.VANILLA_ICE_CREAM, codename = "VanillaIceCream") override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) if (!SdkLevel.isAtLeastV() || !Flags.enhancedConfirmationModeApisEnabled()) { |