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

Commit 549baaa4 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "API council requested tweaks to SystemClock." into pi-dev am: 0bff5a6d 

am: de5b4f3c

Change-Id: Ic19a334c177c4eaeb3882479f6e5fcfb8644a0fb
parents 90841a40 de5b4f3c

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -33068,8 +33068,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) {