[ECM] Use ChecksSdkIntAtLeast(V), try #2

Fix the lint error:

    Error: Call requires API level 35 (current min is 30)

...and actually test it this time.

Test: m out/soong/.intermediates/packages/modules/Permission/PermissionController/PermissionController-lib/android_common_apex30/e81986d0fdbc7fd1cfb6129a176a7913/lint/lint-baseline.xml
Bug: 330256591
Change-Id: Ib44ca72257845edd10b8cdbd25f4e59f9a887d02

2 files changed, 5 insertions, 2 deletions

diff --git a/PermissionController/src/com/android/permissioncontroller/ecm/EnhancedConfirmationDialogActivity.kt b/PermissionController/src/com/android/permissioncontroller/ecm/EnhancedConfirmationDialogActivity.kt
index 724dc1a8e..f7b289ff5 100644
--- a/PermissionController/src/com/android/permissioncontroller/ecm/EnhancedConfirmationDialogActivity.kt
+++ b/PermissionController/src/com/android/permissioncontroller/ecm/EnhancedConfirmationDialogActivity.kt
@@ -34,8 +34,8 @@ 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
 import androidx.fragment.app.FragmentActivity
 import com.android.modules.utils.build.SdkLevel
@@ -48,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"
@@ -56,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()) {
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java
index aedfe4715..42bd951e9 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java
@@ -77,6 +77,7 @@ import androidx.annotation.ChecksSdkIntAtLeast;
 import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import androidx.annotation.StringRes;
 import androidx.core.util.Preconditions;
 
@@ -539,6 +540,7 @@ public class GrantPermissionsActivity extends SettingsActivity
         }
     }
 
+    @RequiresApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)
     private boolean isPermissionEcmRestricted(EnhancedConfirmationManager ecm,
             String requestedPermission, String packageName) {
         try {
@@ -548,6 +550,7 @@ public class GrantPermissionsActivity extends SettingsActivity
         }
     }
 
+    @RequiresApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)
     private boolean wasEcmDialogAlreadyShown(EnhancedConfirmationManager ecm,
             String packageName) {
         try {