diff options
Diffstat (limited to 'api/current.txt')
| -rw-r--r-- | api/current.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index b8caad8..3c4555f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -12172,7 +12172,7 @@ package android.media { method public int getSampleRate(); method public int getState(); method public int getStreamType(); - method public android.media.AudioTimestamp getTimestamp(android.media.AudioTimestamp); + method public boolean getTimestamp(android.media.AudioTimestamp); method public void pause() throws java.lang.IllegalStateException; method public void play() throws java.lang.IllegalStateException; method public void release(); @@ -12790,6 +12790,7 @@ package android.media { ctor public MediaMuxer(java.lang.String, int) throws java.io.IOException; method public int addTrack(android.media.MediaFormat); method public void release(); + method public void setLocation(float, float); method public void setOrientationHint(int); method public void start(); method public void stop(); @@ -15266,7 +15267,7 @@ package android.nfc.cardemulation { method public final void notifyUnhandled(); method public final android.os.IBinder onBind(android.content.Intent); method public abstract void onDeactivated(int); - method public byte[] processCommandApdu(byte[], android.os.Bundle); + method public abstract byte[] processCommandApdu(byte[], android.os.Bundle); method public final void sendResponseApdu(byte[]); field public static final int DEACTIVATION_DESELECTED = 1; // 0x1 field public static final int DEACTIVATION_LINK_LOSS = 0; // 0x0 |