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

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

Merge changes I3f6c3260,I0f4d685d 

* changes:
  Remove @SystemApi from Compatibility
  Revert "Make createSource(ContentResolver, Uri, Resources) a SystemApi"
parents 3131ab32 2af10003

core/api/module-lib-current.txt

+0 −12
Original line number Diff line number Diff line
@@ -43,18 +43,6 @@ package android.content.rollback { 


}



package android.graphics {



  public final class Compatibility {

    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 {



  public class AudioManager {

graphics/java/android/graphics/Compatibility.java

+0 −4
Original line number Diff line number Diff line
@@ -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);

graphics/java/android/graphics/ImageDecoder.java

+0 −5
Original line number Diff line number Diff line
@@ -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,