Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99c1b5a1 authored by Leon Scroggins's avatar Leon Scroggins Committed by Android (Google) Code Review
Browse files

Merge "Make createSource(ContentResolver, Uri, Resources) a SystemApi"

parents c99ea97c 97eacc36

api/module-lib-current.txt

+8 −0
Original line number Diff line number Diff line
@@ -17,6 +17,14 @@ package android.content.rollback { 


}



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 {

graphics/java/android/graphics/ImageDecoder.java

+5 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 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;
@@ -918,8 +919,12 @@ 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,