Clean up UnflaggedApi.

Bug: 353479602
Test: m
Change-Id: I6b9c456ea9ac38872ed9972d301c2bd9f870e3ae

4 files changed, 0 insertions, 27 deletions

diff --git a/libartservice/service/api/system-server-lint-baseline.txt b/libartservice/service/api/system-server-lint-baseline.txt
index 17628b2704..88abaf320d 100644
--- a/libartservice/service/api/system-server-lint-baseline.txt
+++ b/libartservice/service/api/system-server-lint-baseline.txt
@@ -1,15 +1,3 @@
 // Baseline format: 1.0
 DeprecationMismatch: com.android.server.art.ArtManagerLocal#ArtManagerLocal():
     Constructor com.android.server.art.ArtManagerLocal.ArtManagerLocal(): @Deprecated annotation (present) and @deprecated doc tag (not present) do not match
-
-
-UnflaggedApi: com.android.server.art.model.DexoptResult#EXTENDED_BAD_EXTERNAL_PROFILE:
-    New API must be flagged with @FlaggedApi: field com.android.server.art.model.DexoptResult.EXTENDED_BAD_EXTERNAL_PROFILE
-UnflaggedApi: com.android.server.art.model.DexoptResult#EXTENDED_SKIPPED_NO_DEX_CODE:
-    New API must be flagged with @FlaggedApi: field com.android.server.art.model.DexoptResult.EXTENDED_SKIPPED_NO_DEX_CODE
-UnflaggedApi: com.android.server.art.model.DexoptResult#EXTENDED_SKIPPED_STORAGE_LOW:
-    New API must be flagged with @FlaggedApi: field com.android.server.art.model.DexoptResult.EXTENDED_SKIPPED_STORAGE_LOW
-UnflaggedApi: com.android.server.art.model.DexoptResult.DexContainerFileDexoptResult#getExtendedStatusFlags():
-    New API must be flagged with @FlaggedApi: method com.android.server.art.model.DexoptResult.DexContainerFileDexoptResult.getExtendedStatusFlags()
-UnflaggedApi: com.android.server.art.model.DexoptResult.DexContainerFileDexoptResult#getExternalProfileErrors():
-    New API must be flagged with @FlaggedApi: method com.android.server.art.model.DexoptResult.DexContainerFileDexoptResult.getExternalProfileErrors()
diff --git a/libartservice/service/java/com/android/server/art/ArtManagerLocal.java b/libartservice/service/java/com/android/server/art/ArtManagerLocal.java
index 0d9303ed30..61d3b159c7 100644
--- a/libartservice/service/java/com/android/server/art/ArtManagerLocal.java
+++ b/libartservice/service/java/com/android/server/art/ArtManagerLocal.java
@@ -36,7 +36,6 @@ import static com.android.server.art.model.DexoptStatus.DexContainerFileDexoptSt
 import android.annotation.CallbackExecutor;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
-import android.annotation.SuppressLint;
 import android.annotation.SystemApi;
 import android.annotation.SystemService;
 import android.app.job.JobInfo;
@@ -940,7 +939,6 @@ public final class ArtManagerLocal {
      *         the directory beneath /apex, e.g., {@code com.android.art} (not the <b>package
      *         names</b>, e.g., {@code com.google.android.art}).
      */
-    @SuppressLint("UnflaggedApi") // Flag support for mainline is not available.
     @RequiresApi(Build.VERSION_CODES.VANILLA_ICE_CREAM)
     public void onApexStaged(@NonNull String[] stagedApexModuleNames) {
         mInjector.getPreRebootDexoptJob().onUpdateReady(null /* otaSlot */);
@@ -987,7 +985,6 @@ public final class ArtManagerLocal {
      * @throws IllegalStateException if the operation encounters an error that should never happen
      *         (e.g., an internal logic error).
      */
-    @SuppressLint("UnflaggedApi") // Flag support for mainline is not available.
     @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
     @NonNull
     public ArtManagedFileStats getArtManagedFileStats(
@@ -1038,7 +1035,6 @@ public final class ArtManagerLocal {
      * Overrides the compiler filter of a package. The callback is called whenever a package is
      * going to be dexopted. This method is thread-safe.
      */
-    @SuppressLint("UnflaggedApi") // Flag support for mainline is not available.
     @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
     public void setAdjustCompilerFilterCallback(@NonNull @CallbackExecutor Executor executor,
             @NonNull AdjustCompilerFilterCallback callback) {
@@ -1050,7 +1046,6 @@ public final class ArtManagerLocal {
      * #setAdjustCompilerFilterCallback(Executor, AdjustCompilerFilterCallback)}. This
      * method is thread-safe.
      */
-    @SuppressLint("UnflaggedApi") // Flag support for mainline is not available.
     @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
     public void clearAdjustCompilerFilterCallback() {
         mInjector.getConfig().clearAdjustCompilerFilterCallback();
@@ -1448,7 +1443,6 @@ public final class ArtManagerLocal {
     }
 
     /** @hide */
-    @SuppressLint("UnflaggedApi") // Flag support for mainline is not available.
     @SystemApi(client = SystemApi.Client.SYSTEM_SERVER)
     @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
     public interface AdjustCompilerFilterCallback {
@@ -1492,7 +1486,6 @@ public final class ArtManagerLocal {
          * @return the compiler filter after adjustment. This will be the input to step 5 described
          *         above
          */
-        @SuppressLint("UnflaggedApi") // Flag support for mainline is not available.
         @NonNull
         String onAdjustCompilerFilter(@NonNull String packageName,
                 @NonNull String originalCompilerFilter, @NonNull String reason);
diff --git a/libartservice/service/java/com/android/server/art/model/ArtFlags.java b/libartservice/service/java/com/android/server/art/model/ArtFlags.java
index 0a1d52bcbc..0a79d74089 100644
--- a/libartservice/service/java/com/android/server/art/model/ArtFlags.java
+++ b/libartservice/service/java/com/android/server/art/model/ArtFlags.java
@@ -18,7 +18,6 @@ package com.android.server.art.model;
 
 import android.annotation.IntDef;
 import android.annotation.NonNull;
-import android.annotation.SuppressLint;
 import android.annotation.SystemApi;
 import android.app.job.JobScheduler;
 
@@ -86,7 +85,6 @@ public class ArtFlags {
      * useful when the compiler filter is not explicitly specified (i.e., is inferred from the
      * compilation reason).
      */
-    @SuppressLint("UnflaggedApi") // Flag support for mainline is not available.
     public static final int FLAG_IGNORE_PROFILE = 1 << 7;
     /**
      * Whether to force merge profiles even if the difference between before and after the merge
diff --git a/libartservice/service/java/com/android/server/art/model/ArtManagedFileStats.java b/libartservice/service/java/com/android/server/art/model/ArtManagedFileStats.java
index 794ff796b5..e27d54d5c0 100644
--- a/libartservice/service/java/com/android/server/art/model/ArtManagedFileStats.java
+++ b/libartservice/service/java/com/android/server/art/model/ArtManagedFileStats.java
@@ -18,7 +18,6 @@ package com.android.server.art.model;
 
 import android.annotation.IntDef;
 import android.annotation.NonNull;
-import android.annotation.SuppressLint;
 import android.annotation.SystemApi;
 
 import com.android.internal.annotations.Immutable;
@@ -33,7 +32,6 @@ import java.util.Map;
  *
  * @hide
  */
-@SuppressLint("UnflaggedApi") // Flag support for mainline is not available.
 @SystemApi(client = SystemApi.Client.SYSTEM_SERVER)
 @Immutable
 public class ArtManagedFileStats {
@@ -47,21 +45,18 @@ public class ArtManagedFileStats {
      * For a preload app, this type includes dexopt artifacts on readonly partitions if they are
      * up-to-date.
      */
-    @SuppressLint("UnflaggedApi") // Flag support for mainline is not available.
     public static final int TYPE_DEXOPT_ARTIFACT = 0;
     /**
      * Reference profiles.
      *
      * They are the ones used during the last profile-guided dexopt.
      */
-    @SuppressLint("UnflaggedApi") // Flag support for mainline is not available.
     public static final int TYPE_REF_PROFILE = 1;
     /**
      * Current profiles.
      *
      * They may be used during the next profile-guided dexopt.
      */
-    @SuppressLint("UnflaggedApi") // Flag support for mainline is not available.
     public static final int TYPE_CUR_PROFILE = 2;
 
     /** @hide */
@@ -88,7 +83,6 @@ public class ArtManagedFileStats {
      * @throws IllegalArgumentException if {@code fileType} is not one of those defined in {@link
      *         FileTypes}.
      */
-    @SuppressLint("UnflaggedApi") // Flag support for mainline is not available.
     public long getTotalSizeBytesByType(@FileTypes int fileType) {
         Long value = mTotalSizesBytes.get(fileType);
         if (value == null) {