From 2af10003c42cc46525948ee11ed1a2a55b8a355d Mon Sep 17 00:00:00 2001
From: Leon Scroggins III <scroggo@google.com>
Date: Tue, 10 Nov 2020 14:57:09 -0500
Subject: [PATCH] Remove @SystemApi from Compatibility

Bug: 152322291
Bug: 172934376
Test: make

The UI Rendering mainline module is on hold for now, so this does not
need to be @SystemApi. The system can still access it through @hide.

This leaves in place the new Compatibility class (added in
Ie7172fb93364a1e04ab844b8fa64887bf9d8b005), which seems just as good as
the old approach, and we can switch it back to @SystemApi if/when we
restart the module.

Change-Id: I3f6c32603c4eace55ece04936bff6f9336cf6627
---
 core/api/module-lib-current.txt                   | 8 --------
 graphics/java/android/graphics/Compatibility.java | 4 ----
 2 files changed, 12 deletions(-)

diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt
index 781385c455d52..6409dd9433830 100644
--- a/core/api/module-lib-current.txt
+++ b/core/api/module-lib-current.txt
@@ -42,14 +42,6 @@ package android.content.rollback {
 
 }
 
-package android.graphics {
-
-  public final class Compatibility {
-    method public static void setTargetSdkVersion(int);
-  }
-
-}
-
 package android.media {
 
   public class AudioManager {
diff --git a/graphics/java/android/graphics/Compatibility.java b/graphics/java/android/graphics/Compatibility.java
index ed849127aedcf..747fbf111b4b7 100644
--- a/graphics/java/android/graphics/Compatibility.java
+++ b/graphics/java/android/graphics/Compatibility.java
@@ -16,14 +16,11 @@
 
 package android.graphics;
 
-import android.annotation.SystemApi;
-
 /**
  * Helper class for graphics classes to retrieve the targetSdkVersion, as
  * specified by the app.
  * @hide
  */
-@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
 public final class Compatibility {
     private Compatibility() {}
 
@@ -34,7 +31,6 @@ public final class Compatibility {
      * application. No other code should call this.
      * @hide
      */
-    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
     public static void setTargetSdkVersion(int targetSdkVersion) {
         sTargetSdkVersion = targetSdkVersion;
         Canvas.setCompatibilityVersion(targetSdkVersion);