Merge "Expose Image and Plane for testing" am: 56804f0560 am: ce1dd0aafd am: b8a7381930

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

Change-Id: Iba02e5a7e7936e93923fcd891a91be9e874888a0

api/test-current.txt

@@ -877,6 +877,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

@@ -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() {
         }