diff options
| author | Lajos Molnar <lajos@google.com> | 2014-05-30 23:14:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-30 23:14:55 +0000 |
| commit | a6716aade1d7bf0a60457d80da6aa85bc1006f57 (patch) | |
| tree | 5b1277d72f70a5a4f6c4ef82b11257fd30ee0a4e /api | |
| parent | 283c907a6a84c5d9ffe38d3468e76131e6917105 (diff) | |
| parent | 8c5d0f2120d2006aa2115105b7c6dbf0b86058ae (diff) | |
| download | frameworks_base-a6716aade1d7bf0a60457d80da6aa85bc1006f57.zip frameworks_base-a6716aade1d7bf0a60457d80da6aa85bc1006f57.tar.gz frameworks_base-a6716aade1d7bf0a60457d80da6aa85bc1006f57.tar.bz2 | |
Merge changes I1fd178b6,I5093672e into lmp-preview-dev
* changes:
DO NOT MERGE: media.MediaCodec: hide NotificationCallback listener
media.MediaCodec: document and fix-up setNotificationCallback
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt index 92e8b24..ab287fb 100644 --- a/api/current.txt +++ b/api/current.txt @@ -14195,7 +14195,6 @@ package android.media { 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(); @@ -14245,10 +14244,6 @@ package android.media { field public int numSubSamples; } - public static abstract interface 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(); |