From 99b7556cb2731c9075aee25bec185641c007887d Mon Sep 17 00:00:00 2001
From: Leon Scroggins <scroggo@google.com>
Date: Tue, 10 Nov 2020 19:35:34 +0000
Subject: [PATCH] Revert "Make createSource(ContentResolver, Uri, Resources) a
 SystemApi"

Bug: 152322291
Bug: 172934376
Test: make

This reverts commit 97eacc36a3551efcaf97e5c02f4427882e6d6030.

Reason for revert: 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.

Change-Id: I0f4d685d62cf468a3fd9a7e664bcc46569e94591
---
 core/api/module-lib-current.txt                  | 4 ----
 graphics/java/android/graphics/ImageDecoder.java | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt
index 06e6d9ccbbf01..781385c455d52 100644
--- a/core/api/module-lib-current.txt
+++ b/core/api/module-lib-current.txt
@@ -48,10 +48,6 @@ package android.graphics {
     method public static void setTargetSdkVersion(int);
   }
 
-  public final class ImageDecoder implements java.lang.AutoCloseable {
-    method @AnyThread @NonNull public static android.graphics.ImageDecoder.Source createSource(@NonNull android.content.ContentResolver, @NonNull android.net.Uri, @Nullable android.content.res.Resources);
-  }
-
 }
 
 package android.media {
diff --git a/graphics/java/android/graphics/ImageDecoder.java b/graphics/java/android/graphics/ImageDecoder.java
index 4cac7fbb023bd..3732285861618 100644
--- a/graphics/java/android/graphics/ImageDecoder.java
+++ b/graphics/java/android/graphics/ImageDecoder.java
@@ -27,7 +27,6 @@ import android.annotation.IntRange;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.Px;
-import android.annotation.SystemApi;
 import android.annotation.TestApi;
 import android.annotation.WorkerThread;
 import android.content.ContentResolver;
@@ -916,12 +915,8 @@ public final class ImageDecoder implements AutoCloseable {
     /**
      * Provide Resources for density scaling.
      *
-     * This is a SystemApi to enable legacy behavior, so there is no need to
-     * make it public like the version above, which does not have a Resources
-     * parameter.
      * @hide
      */
-    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
     @AnyThread
     @NonNull
     public static Source createSource(@NonNull ContentResolver cr,