commit 0bff5a6dfa4a37414ca7831db41f772125125a6a
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 27 02:40:24 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 27 02:40:24 2018 +0000
tree ad5795a3380e0e72ee4132e1dda0301e44661262
parent fddbae9c78b605d16d813123b6dde67fdeee63ae
parent ae1324a32ea4addea2d36ed2e86a239529decad7

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

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 7103928..fa86188 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -33070,8 +33070,6 @@
   }
 
   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

diff --git a/core/java/android/os/SystemClock.java b/core/java/android/os/SystemClock.java
index 0f70427..b254166 100644
--- a/core/java/android/os/SystemClock.java
+++ b/core/java/android/os/SystemClock.java
@@ -269,6 +269,7 @@
      * 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 @@
      * time or throw.
      *
      * @throws DateTimeException when no accurate network time can be provided.
+     * @hide
      */
     public static @NonNull Clock currentNetworkTimeClock() {
         return new SimpleClock(ZoneOffset.UTC) {