From ae1324a32ea4addea2d36ed2e86a239529decad7 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Mon, 26 Mar 2018 15:26:00 -0600 Subject: [PATCH] API council requested tweaks to SystemClock. Test: none Bug: 73952114 Change-Id: Idd7aae5161a2326920860a6a9c7137369a4d8b3d --- api/current.txt | 2 -- core/java/android/os/SystemClock.java | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/current.txt b/api/current.txt index 5e7fa591385e0..693f0f6831a34 100644 --- a/api/current.txt +++ b/api/current.txt @@ -33093,8 +33093,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(); diff --git a/core/java/android/os/SystemClock.java b/core/java/android/os/SystemClock.java index 0f70427e6dc09..b254166303bc5 100644 --- a/core/java/android/os/SystemClock.java +++ b/core/java/android/os/SystemClock.java @@ -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) {