Merge "Remove Requires*ByDefault annotation." into main

2 files changed, 0 insertions, 41 deletions

diff --git a/SafetyCenter/Annotations/Android.bp b/SafetyCenter/Annotations/Android.bp
index 852d734b0..c04f40333 100644
--- a/SafetyCenter/Annotations/Android.bp
+++ b/SafetyCenter/Annotations/Android.bp
@@ -32,7 +32,6 @@ java_library {
         ":safetycenter-annotations-sources",
     ],
     libs: [
-        "androidx.annotation_annotation",
         "jsr305",
     ],
     apex_available: [
diff --git a/SafetyCenter/Annotations/java/com/android/safetycenter/annotations/RequiresVanillaIceCreamByDefault.java b/SafetyCenter/Annotations/java/com/android/safetycenter/annotations/RequiresVanillaIceCreamByDefault.java
deleted file mode 100644
index bb1c1eb97..000000000
--- a/SafetyCenter/Annotations/java/com/android/safetycenter/annotations/RequiresVanillaIceCreamByDefault.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.VANILLA_ICE_CREAM;
-
-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(VANILLA_ICE_CREAM)} within the annotated package,
- * unless tagged another {@code @RequiresApi} annotation.
- */
-@Retention(CLASS)
-@Target(PACKAGE)
-@TypeQualifierDefault({TYPE})
-@RequiresApi(VANILLA_ICE_CREAM)
-public @interface RequiresVanillaIceCreamByDefault {}