Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 0bff5a6dfa

Change-Id: I5b7d6247342eaddb8024842cecfc516ae2aa5fcc
This commit is contained in:
Jeff Sharkey
2018-03-27 03:04:34 +00:00
committed by android-build-merger
parent 574eff078d 0bff5a6dfa
commit de5b4f3c99
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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();

2
core/java/android/os/SystemClock.java
View File

@@ -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) {