commit 56804f05607e5babe4ffd13262a937f54f24d7ee
author Emilian Peev <epeev@google.com> Fri Oct 30 16:10:30 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 30 16:10:30 2020 +0000
tree 16bbbd632fe31acb723d62f0f757b9658cc4051b
parent ad2bb796b00004d6ba311145dc2a3026a2dc2b4d
parent 2e686f164caf02d565ca52f61d4f1f2c55b9041d

Merge "Expose Image and Plane for testing"

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 93f9e2c..9c51729 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -876,6 +876,14 @@
     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

diff --git a/media/java/android/media/Image.java b/media/java/android/media/Image.java
index 79b8611..610bffe 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 @@
      * @hide
      */
     @UnsupportedAppUsage
+    @TestApi
     protected Image() {
     }
 
@@ -387,6 +389,7 @@
          * @hide
          */
         @UnsupportedAppUsage
+        @TestApi
         protected Plane() {
         }