Merge "Expose Image and Plane for testing"

2 files changed, 11 insertions, 0 deletions

diff --git a/api/test-current.txt b/api/test-current.txt
index 93f9e2c907d6..9c517296d35c 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -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();
   }
diff --git a/media/java/android/media/Image.java b/media/java/android/media/Image.java
index 79b861136b64..610bffe13eae 100644
--- a/media/java/android/media/Image.java
+++ b/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() {
         }