summaryrefslogtreecommitdiffstats
path: root/api/system-current.txt
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-05-14 21:17:27 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-14 21:17:30 +0000
commitaf0479446bf2bfaa252bfe4bc924346632013f40 (patch)
treefd23b52e329b9f442299db6a06fa806edf5e3cbc /api/system-current.txt
parent55a302402be3240c9e3289351c01e1cd2e853bc8 (diff)
parent05a822161fe0296b01f573192adf306c0ce38c9c (diff)
downloadframeworks_base-af0479446bf2bfaa252bfe4bc924346632013f40.zip
frameworks_base-af0479446bf2bfaa252bfe4bc924346632013f40.tar.gz
frameworks_base-af0479446bf2bfaa252bfe4bc924346632013f40.tar.bz2
Merge "media: change final fields to accessors in MediaTimestamp" into mnc-dev
Diffstat (limited to 'api/system-current.txt')
-rw-r--r--api/system-current.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index 119295d..72c2f56 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -17699,9 +17699,9 @@ package android.media {
}
public final class MediaTimestamp {
- field public final float clockRate;
- field public final long mediaTimeUs;
- field public final long nanoTime;
+ method public long getAnchorMediaTimeUs();
+ method public long getAnchorSytemNanoTime();
+ method public float getMediaClockRate();
}
public final class NotProvisionedException extends android.media.MediaDrmException {