Merge "Fix a typo on MediaTimestamp.getAnchorSytemNanoTime()" (b1e8a6f6) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -24500,7 +24500,8 @@ package android.media {

		public final class MediaTimestamp {
		method public long getAnchorMediaTimeUs();
		method public long getAnchorSytemNanoTime();
		method public long getAnchorSystemNanoTime();
		method public deprecated long getAnchorSytemNanoTime();
		method public float getMediaClockRate();
		field public static final android.media.MediaTimestamp TIMESTAMP_UNKNOWN;
		}

+10 −0

Original line number	Diff line number	Diff line
		@@ -51,8 +51,18 @@ public final class MediaTimestamp
		/**
		* Get the {@link java.lang.System#nanoTime system time} corresponding to the media time
		* in nanoseconds.
		* @deprecated use {@link #getAnchorSystemNanoTime} instead.
		*/
		@Deprecated
		public long getAnchorSytemNanoTime() {
		return getAnchorSystemNanoTime();
		}

		/**
		* Get the {@link java.lang.System#nanoTime system time} corresponding to the media time
		* in nanoseconds.
		*/
		public long getAnchorSystemNanoTime() {
		return nanoTime;
		}