Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bff5a6d authored Mar 27, 2018 by TreeHugger Robot Committed by Android (Google) Code Review Mar 27, 2018

Merge "API council requested tweaks to SystemClock." into pi-dev

parents fddbae9c ae1324a3

api/current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -33070,8 +33070,6 @@ package android.os {
		}

		public final class SystemClock {
		method public static java.time.Clock currentNetworkTimeClock();
		method public static long currentNetworkTimeMillis();
		method public static long currentThreadTimeMillis();
		method public static long elapsedRealtime();
		method public static long elapsedRealtimeNanos();

core/java/android/os/SystemClock.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -269,6 +269,7 @@ public final class SystemClock {
		* time or throw.
		*
		* @throws DateTimeException when no accurate network time can be provided.
		* @hide
		*/
		public static long currentNetworkTimeMillis() {
		final IAlarmManager mgr = IAlarmManager.Stub
		@@ -302,6 +303,7 @@ public final class SystemClock {
		* time or throw.
		*
		* @throws DateTimeException when no accurate network time can be provided.
		* @hide
		*/
		public static @NonNull Clock currentNetworkTimeClock() {
		return new SimpleClock(ZoneOffset.UTC) {