DO NOT MERGE: media.MediaCodec: hide NotificationCallback listener
Bug: 15091403
Change-Id: I1fd178b6872997055c2ee0b7edfa0264a7d6718b
diff --git a/api/current.txt b/api/current.txt
index 146d3c3..02d8450 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -14201,7 +14201,6 @@
method public final void release();
method public final void releaseOutputBuffer(int, boolean);
method public final void releaseOutputBuffer(int, long);
- method public void setNotificationCallback(android.media.MediaCodec.NotificationCallback);
method public final void setParameters(android.os.Bundle);
method public final void setVideoScalingMode(int);
method public final void signalEndOfInputStream();
@@ -14251,11 +14250,6 @@
field public int numSubSamples;
}
- public static abstract class MediaCodec.NotificationCallback {
- ctor public MediaCodec.NotificationCallback();
- method public abstract void onCodecNotify(android.media.MediaCodec);
- }
-
public final class MediaCodecInfo {
method public final android.media.MediaCodecInfo.CodecCapabilities getCapabilitiesForType(java.lang.String);
method public final java.lang.String getName();
diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java
index cb9d4d5..f258063 100644
--- a/media/java/android/media/MediaCodec.java
+++ b/media/java/android/media/MediaCodec.java
@@ -749,6 +749,8 @@
* <p>Call this method with a null listener to stop receiving event notifications.
*
* @param cb The listener that will run.
+ *
+ * @hide
*/
public void setNotificationCallback(NotificationCallback cb) {
mNotificationCallback = cb;
@@ -758,6 +760,8 @@
* MediaCodec listener interface. Used to notify the user of MediaCodec
* when there are available input and/or output buffers, a change in
* configuration or when a codec error happened.
+ *
+ * @hide
*/
public static abstract class NotificationCallback {
/**
@@ -771,6 +775,7 @@
* repeatedly with a zero timeout until {@link #INFO_TRY_AGAIN_LATER} is returned.
*
* @param codec the MediaCodec instance that has an actionable event.
+ *
*/
public abstract void onCodecNotify(MediaCodec codec);
}