Merge "Make createSource(ContentResolver, Uri, Resources) a SystemApi"
diff --git a/api/module-lib-current.txt b/api/module-lib-current.txt
index 4cb7f64..45917e7 100644
--- a/api/module-lib-current.txt
+++ b/api/module-lib-current.txt
@@ -17,6 +17,14 @@
}
+package android.graphics {
+
+ 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.net {
public final class TetheredClient implements android.os.Parcelable {
diff --git a/graphics/java/android/graphics/ImageDecoder.java b/graphics/java/android/graphics/ImageDecoder.java
index 286b887..3622f51 100644
--- a/graphics/java/android/graphics/ImageDecoder.java
+++ b/graphics/java/android/graphics/ImageDecoder.java
@@ -27,6 +27,7 @@
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;
@@ -918,8 +919,12 @@
/**
* 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,