diff options
| author | 2014-01-06 19:05:09 +0000 | |
|---|---|---|
| committer | 2014-01-06 19:05:09 +0000 | |
| commit | f12aa45bcbcd3d41b51c70401fac5786d3d881a5 (patch) | |
| tree | 372a38ec90f5fdde31fdda787ddd5f2fed0a6ab5 /api | |
| parent | dcd8258e2447afacb6d6f793c2cfb7ad94d2acec (diff) | |
| parent | 83cc994ba40a7227c62a65ccb5addf3a23ff6350 (diff) | |
Merge "MediaRecorder: add getSurface() api and SURFACE video source"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 243c412d4253..14952772778e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -13187,6 +13187,7 @@ package android.media { ctor public MediaRecorder(); method public static final int getAudioSourceMax(); method public int getMaxAmplitude() throws java.lang.IllegalStateException; + method public android.view.Surface getSurface(); method public void prepare() throws java.io.IOException, java.lang.IllegalStateException; method public void release(); method public void reset(); @@ -13271,6 +13272,7 @@ package android.media { public final class MediaRecorder.VideoSource { field public static final int CAMERA = 1; // 0x1 field public static final int DEFAULT = 0; // 0x0 + field public static final int SURFACE = 2; // 0x2 } public class MediaRouter { |