media: rename MediaCodec.setSurface to setOutputSurface

Bug: 21045402
Change-Id: Ie57880af6ce6feea9713360b094f2b198d3c119e

diff --git a/api/current.txt b/api/current.txt
index fac703e..1698349 100644 (file)
--- a/api/current.txt
+++ b/api/current.txt
@@ -15341,8 +15341,8 @@ package android.media {
     method public void setCallback(android.media.MediaCodec.Callback);
     method public void setInputSurface(android.view.Surface);
     method public void setOnFrameRenderedListener(android.media.MediaCodec.OnFrameRenderedListener, android.os.Handler);
+    method public void setOutputSurface(android.view.Surface);
     method public final void setParameters(android.os.Bundle);
-    method public void setSurface(android.view.Surface);
     method public final void setVideoScalingMode(int);
     method public final void signalEndOfInputStream();
     method public final void start();

diff --git a/api/system-current.txt b/api/system-current.txt
index 2318704..b9bc0a6 100644 (file)
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -16575,8 +16575,8 @@ package android.media {
     method public void setCallback(android.media.MediaCodec.Callback);
     method public void setInputSurface(android.view.Surface);
     method public void setOnFrameRenderedListener(android.media.MediaCodec.OnFrameRenderedListener, android.os.Handler);
+    method public void setOutputSurface(android.view.Surface);
     method public final void setParameters(android.os.Bundle);
-    method public void setSurface(android.view.Surface);
     method public final void setVideoScalingMode(int);
     method public final void signalEndOfInputStream();
     method public final void start();

diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java
index 75c4694..6f28bf6 100644 (file)
--- a/media/java/android/media/MediaCodec.java
+++ b/media/java/android/media/MediaCodec.java
@@ -660,7 +660,7 @@ final public class MediaCodec {
      *            surface in the current state.
      *  @throws IllegalArgumentException if the new surface is not of a suitable type for the codec.
      */
-    public void setSurface(@NonNull Surface surface) {
+    public void setOutputSurface(@NonNull Surface surface) {
         if (!mHasSurface) {
             throw new IllegalStateException("codec was not configured for an output surface");
         }