Use RequiresApi annotation directly.

The lint is failing on CL, this appears to be due to the
RequiresApiTiramisuByDefault annotation.

Looks like the android.annotation.RequiresApi annotation
can be used on a package directly.

I've checked this on a CL and it appears to be WAI.
Let's try to submit this CL and check if the lint errors do
go away. Otherwise I'll revert back to using RequiresApi
on every class.

Test: lint works
Bug: 303836855
Relnote: N/A
Change-Id: Ied51bd506ec8a8ea59bbf63edd06423939df9a74

5 files changed, 20 insertions, 48 deletions

diff --git a/SafetyCenter/Annotations/java/com/android/safetycenter/annotations/RequiresTiramisuByDefault.java b/SafetyCenter/Annotations/java/com/android/safetycenter/annotations/RequiresTiramisuByDefault.java
deleted file mode 100644
index 6e1f4c3b7..000000000
--- a/SafetyCenter/Annotations/java/com/android/safetycenter/annotations/RequiresTiramisuByDefault.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2023 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.safetycenter.annotations;
-
-import static android.os.Build.VERSION_CODES.TIRAMISU;
-
-import static java.lang.annotation.ElementType.PACKAGE;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.CLASS;
-
-import androidx.annotation.RequiresApi;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.annotation.meta.TypeQualifierDefault;
-
-/**
- * Specifies that all types are {@code RequiresApi(TIRAMISU)} within the annotated package, unless
- * tagged another {@code @RequiresApi} annotation.
- */
-@Retention(CLASS)
-@Target(PACKAGE)
-@TypeQualifierDefault({TYPE})
-@RequiresApi(TIRAMISU)
-public @interface RequiresTiramisuByDefault {}
diff --git a/service/java/com/android/safetycenter/data/package-info.java b/service/java/com/android/safetycenter/data/package-info.java
index e82755370..a125b3176 100644
--- a/service/java/com/android/safetycenter/data/package-info.java
+++ b/service/java/com/android/safetycenter/data/package-info.java
@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 @NonNullByDefault
-@RequiresTiramisuByDefault
+@RequiresApi(TIRAMISU)
 package com.android.safetycenter.data;
 
+import static android.os.Build.VERSION_CODES.TIRAMISU;
+
+import android.annotation.RequiresApi;
+
 import com.android.safetycenter.annotations.NonNullByDefault;
-import com.android.safetycenter.annotations.RequiresTiramisuByDefault;
diff --git a/service/java/com/android/safetycenter/logging/package-info.java b/service/java/com/android/safetycenter/logging/package-info.java
index 47575f2d9..79e504ebd 100644
--- a/service/java/com/android/safetycenter/logging/package-info.java
+++ b/service/java/com/android/safetycenter/logging/package-info.java
@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 @NonNullByDefault
-@RequiresTiramisuByDefault
+@RequiresApi(TIRAMISU)
 package com.android.safetycenter.logging;
 
+import static android.os.Build.VERSION_CODES.TIRAMISU;
+
+import android.annotation.RequiresApi;
+
 import com.android.safetycenter.annotations.NonNullByDefault;
-import com.android.safetycenter.annotations.RequiresTiramisuByDefault;
diff --git a/service/java/com/android/safetycenter/notifications/package-info.java b/service/java/com/android/safetycenter/notifications/package-info.java
index e16c06d58..83d886fe1 100644
--- a/service/java/com/android/safetycenter/notifications/package-info.java
+++ b/service/java/com/android/safetycenter/notifications/package-info.java
@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 @NonNullByDefault
-@RequiresTiramisuByDefault
+@RequiresApi(TIRAMISU)
 package com.android.safetycenter.notifications;
 
+import static android.os.Build.VERSION_CODES.TIRAMISU;
+
+import android.annotation.RequiresApi;
+
 import com.android.safetycenter.annotations.NonNullByDefault;
-import com.android.safetycenter.annotations.RequiresTiramisuByDefault;
diff --git a/service/java/com/android/safetycenter/package-info.java b/service/java/com/android/safetycenter/package-info.java
index 72774d21e..57142c658 100644
--- a/service/java/com/android/safetycenter/package-info.java
+++ b/service/java/com/android/safetycenter/package-info.java
@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 @NonNullByDefault
-@RequiresTiramisuByDefault
+@RequiresApi(TIRAMISU)
 package com.android.safetycenter;
 
+import static android.os.Build.VERSION_CODES.TIRAMISU;
+
+import android.annotation.RequiresApi;
+
 import com.android.safetycenter.annotations.NonNullByDefault;
-import com.android.safetycenter.annotations.RequiresTiramisuByDefault;