From faf2ba91259b85dc02a86253b65b25d35a6d2ec5 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Thu, 9 Nov 2023 19:11:54 +0000
Subject: Make all typedefs SOURCE retention

The default retention is CLASS, but the correct retention is SOURCE.
There is a metalava check for typedef annotations correctly, but that
check is currently disabled. This is part of the work required to
re-enable that check.

Bug: 309971481
Test: m checkapi
Change-Id: I386efea9321bd2adb2722710056b1d57dd5401f5
---
 graphics/java/android/graphics/Mesh.java          | 3 +++
 graphics/java/android/graphics/drawable/Icon.java | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'graphics/java/android')

diff --git a/graphics/java/android/graphics/Mesh.java b/graphics/java/android/graphics/Mesh.java
index 66fabec91924..a4bce9eb5e88 100644
--- a/graphics/java/android/graphics/Mesh.java
+++ b/graphics/java/android/graphics/Mesh.java
@@ -23,6 +23,8 @@ import android.annotation.NonNull;
 
 import libcore.util.NativeAllocationRegistry;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.nio.Buffer;
 import java.nio.ShortBuffer;
 
@@ -43,6 +45,7 @@ public class Mesh {
      * Determines how the mesh is represented and will be drawn.
      */
     @IntDef({TRIANGLES, TRIANGLE_STRIP})
+    @Retention(RetentionPolicy.SOURCE)
     private @interface Mode {}
 
     /**
diff --git a/graphics/java/android/graphics/drawable/Icon.java b/graphics/java/android/graphics/drawable/Icon.java
index 5509f000aca5..45e29a88c7db 100644
--- a/graphics/java/android/graphics/drawable/Icon.java
+++ b/graphics/java/android/graphics/drawable/Icon.java
@@ -62,6 +62,8 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.util.Arrays;
 import java.util.Objects;
 
@@ -116,6 +118,7 @@ public final class Icon implements Parcelable {
      */
     @IntDef({TYPE_BITMAP, TYPE_RESOURCE, TYPE_DATA, TYPE_URI, TYPE_ADAPTIVE_BITMAP,
             TYPE_URI_ADAPTIVE_BITMAP})
+    @Retention(RetentionPolicy.SOURCE)
     public @interface IconType {
     }
 
-- 
cgit v1.2.3-59-g8ed1b