summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2015-05-14 10:08:08 -0700
committerChong Zhang <chz@google.com>2015-05-14 14:19:01 -0700
commitbc10185fa1669a151568feb72277785d323fc344 (patch)
tree4b00022e0f00be7db717da7064f3bf364af91075 /api
parenta8dca228b254fd1553824d2c5de3aaedc2fe4400 (diff)
downloadframeworks_base-bc10185fa1669a151568feb72277785d323fc344.zip
frameworks_base-bc10185fa1669a151568feb72277785d323fc344.tar.gz
frameworks_base-bc10185fa1669a151568feb72277785d323fc344.tar.bz2
MediaDataSource: address API council comments
- throw IOExecption on fatal errors - add offset argument to readAt - and fix a crash in MediaExtractor bug: 21045118 bug: 21163225 Change-Id: I3c0ff42e539868b9374a4f1f3a9852143f68ba68
Diffstat (limited to 'api')
-rw-r--r--api/current.txt7
-rw-r--r--api/system-current.txt7
2 files changed, 8 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt
index ac623ac..39e5e34 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -15701,9 +15701,10 @@ package android.media {
ctor public MediaCryptoException(java.lang.String);
}
- public abstract interface MediaDataSource implements java.io.Closeable {
- method public abstract long getSize();
- method public abstract int readAt(long, byte[], int);
+ public abstract class MediaDataSource implements java.io.Closeable {
+ ctor public MediaDataSource();
+ method public abstract long getSize() throws java.io.IOException;
+ method public abstract int readAt(long, byte[], int, int) throws java.io.IOException;
}
public class MediaDescription implements android.os.Parcelable {
diff --git a/api/system-current.txt b/api/system-current.txt
index 8ff6f6b..3c7a755 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -16923,9 +16923,10 @@ package android.media {
ctor public MediaCryptoException(java.lang.String);
}
- public abstract interface MediaDataSource implements java.io.Closeable {
- method public abstract long getSize();
- method public abstract int readAt(long, byte[], int);
+ public abstract class MediaDataSource implements java.io.Closeable {
+ ctor public MediaDataSource();
+ method public abstract long getSize() throws java.io.IOException;
+ method public abstract int readAt(long, byte[], int, int) throws java.io.IOException;
}
public class MediaDescription implements android.os.Parcelable {