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

Commit ce1dd0aa authored by Emilian Peev's avatar Emilian Peev Committed by Automerger Merge Worker
Browse files

Merge "Expose Image and Plane for testing" am: 56804f05 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1463664

Change-Id: Ic6ad221e6102a81333deb49b0ca33b3b9a4067a3
parents d6987e84 56804f05

api/test-current.txt

+8 −0
Original line number Diff line number Diff line
@@ -876,6 +876,14 @@ package android.media { 
    field public static final String SAMPLE_RATE = "android.media.audiotrack.sampleRate";

  }



  public abstract class Image implements java.lang.AutoCloseable {

    ctor protected Image();

  }



  public abstract static class Image.Plane {

    ctor protected Image.Plane();

  }



  public final class MediaCas implements java.lang.AutoCloseable {

    method public void forceResourceLost();

  }

media/java/android/media/Image.java

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.media;



import android.annotation.Nullable;

import android.annotation.TestApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.graphics.Rect;

import android.hardware.HardwareBuffer;
@@ -58,6 +59,7 @@ public abstract class Image implements AutoCloseable { 
     * @hide

     */

    @UnsupportedAppUsage

    @TestApi

    protected Image() {

    }
@@ -387,6 +389,7 @@ public abstract class Image implements AutoCloseable { 
         * @hide

         */

        @UnsupportedAppUsage

        @TestApi

        protected Plane() {

        }