diff --git a/core/api/current.txt b/core/api/current.txt index 4f96abe2323ef..36565da633e48 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -32074,6 +32074,7 @@ package android.os { public final class SystemClock { method @NonNull public static java.time.Clock currentGnssTimeClock(); + method @NonNull public static java.time.Clock currentNetworkTimeClock(); 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 d8f63444dd1cc..b9252d6438109 100644 --- a/core/java/android/os/SystemClock.java +++ b/core/java/android/os/SystemClock.java @@ -311,7 +311,6 @@ 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) { diff --git a/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsService.java b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsService.java index ef84ce02e21d3..5584293b7d92c 100644 --- a/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsService.java +++ b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsService.java @@ -113,7 +113,6 @@ import android.net.Uri; import android.net.netstats.provider.INetworkStatsProvider; import android.net.netstats.provider.INetworkStatsProviderCallback; import android.net.netstats.provider.NetworkStatsProvider; -import android.os.BestClock; import android.os.Binder; import android.os.DropBoxManager; import android.os.Environment; @@ -149,6 +148,7 @@ import android.util.proto.ProtoOutputStream; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.FileRotator; +import com.android.net.module.util.BestClock; import com.android.net.module.util.BinderUtils; import com.android.net.module.util.CollectionUtils; import com.android.net.module.util.NetworkStatsUtils;