diff --git a/api/removed.txt b/api/removed.txt index 7713070e44896..b942a67102f67 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -375,7 +375,6 @@ package android.os { public final class SystemClock { method @NonNull public static java.time.Clock elapsedRealtimeClock(); method @NonNull public static java.time.Clock uptimeClock(); - method @Deprecated @NonNull public static java.time.Clock uptimeMillisClock(); } public class TestLooperManager { diff --git a/core/java/android/os/SystemClock.java b/core/java/android/os/SystemClock.java index 64effb8fa0cca..a510e42edcb67 100644 --- a/core/java/android/os/SystemClock.java +++ b/core/java/android/os/SystemClock.java @@ -176,14 +176,6 @@ public final class SystemClock { @CriticalNative native public static long uptimeMillis(); - /** - * @removed - */ - @Deprecated - public static @NonNull Clock uptimeMillisClock() { - return uptimeClock(); - } - /** * Return {@link Clock} that starts at system boot, not counting time spent * in deep sleep. diff --git a/services/core/java/com/android/server/job/JobSchedulerService.java b/services/core/java/com/android/server/job/JobSchedulerService.java index ab4ae9d521bd1..8181900177ef5 100644 --- a/services/core/java/com/android/server/job/JobSchedulerService.java +++ b/services/core/java/com/android/server/job/JobSchedulerService.java @@ -150,7 +150,7 @@ public class JobSchedulerService extends com.android.server.SystemService @VisibleForTesting public static Clock sSystemClock = Clock.systemUTC(); @VisibleForTesting - public static Clock sUptimeMillisClock = SystemClock.uptimeMillisClock(); + public static Clock sUptimeMillisClock = SystemClock.uptimeClock(); @VisibleForTesting public static Clock sElapsedRealtimeClock = SystemClock.elapsedRealtimeClock(); diff --git a/services/tests/mockingservicestests/src/com/android/server/job/controllers/ConnectivityControllerTest.java b/services/tests/mockingservicestests/src/com/android/server/job/controllers/ConnectivityControllerTest.java index c45122ec861da..9fe7b7c77530f 100644 --- a/services/tests/mockingservicestests/src/com/android/server/job/controllers/ConnectivityControllerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/job/controllers/ConnectivityControllerTest.java @@ -109,7 +109,7 @@ public class ConnectivityControllerTest { JobSchedulerService.sSystemClock = Clock.fixed(Clock.systemUTC().instant(), ZoneOffset.UTC); JobSchedulerService.sUptimeMillisClock = - Clock.fixed(SystemClock.uptimeMillisClock().instant(), ZoneOffset.UTC); + Clock.fixed(SystemClock.uptimeClock().instant(), ZoneOffset.UTC); JobSchedulerService.sElapsedRealtimeClock = Clock.fixed(SystemClock.elapsedRealtimeClock().instant(), ZoneOffset.UTC); diff --git a/services/tests/mockingservicestests/src/com/android/server/job/controllers/JobStatusTest.java b/services/tests/mockingservicestests/src/com/android/server/job/controllers/JobStatusTest.java index 4bf62c6638638..94e02d3b2648c 100644 --- a/services/tests/mockingservicestests/src/com/android/server/job/controllers/JobStatusTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/job/controllers/JobStatusTest.java @@ -82,7 +82,7 @@ public class JobStatusTest { JobSchedulerService.sSystemClock = Clock.fixed(Clock.systemUTC().instant(), ZoneOffset.UTC); JobSchedulerService.sUptimeMillisClock = - Clock.fixed(SystemClock.uptimeMillisClock().instant(), ZoneOffset.UTC); + Clock.fixed(SystemClock.uptimeClock().instant(), ZoneOffset.UTC); JobSchedulerService.sElapsedRealtimeClock = Clock.fixed(SystemClock.elapsedRealtimeClock().instant(), ZoneOffset.UTC); } diff --git a/services/tests/mockingservicestests/src/com/android/server/job/controllers/QuotaControllerTest.java b/services/tests/mockingservicestests/src/com/android/server/job/controllers/QuotaControllerTest.java index f07a5b554d376..9f312891fbd05 100644 --- a/services/tests/mockingservicestests/src/com/android/server/job/controllers/QuotaControllerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/job/controllers/QuotaControllerTest.java @@ -170,7 +170,7 @@ public class QuotaControllerTest { getAdvancedClock(Clock.fixed(Clock.systemUTC().instant(), ZoneOffset.UTC), 24 * HOUR_IN_MILLIS); JobSchedulerService.sUptimeMillisClock = getAdvancedClock( - Clock.fixed(SystemClock.uptimeMillisClock().instant(), ZoneOffset.UTC), + Clock.fixed(SystemClock.uptimeClock().instant(), ZoneOffset.UTC), 24 * HOUR_IN_MILLIS); JobSchedulerService.sElapsedRealtimeClock = getAdvancedClock( Clock.fixed(SystemClock.elapsedRealtimeClock().instant(), ZoneOffset.UTC), diff --git a/services/tests/mockingservicestests/src/com/android/server/job/controllers/StateControllerTest.java b/services/tests/mockingservicestests/src/com/android/server/job/controllers/StateControllerTest.java index db69242538be5..7a12b425ca999 100644 --- a/services/tests/mockingservicestests/src/com/android/server/job/controllers/StateControllerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/job/controllers/StateControllerTest.java @@ -117,7 +117,7 @@ public class StateControllerTest { JobSchedulerService.sSystemClock = Clock.fixed(Clock.systemUTC().instant(), ZoneOffset.UTC); JobSchedulerService.sUptimeMillisClock = - Clock.fixed(SystemClock.uptimeMillisClock().instant(), ZoneOffset.UTC); + Clock.fixed(SystemClock.uptimeClock().instant(), ZoneOffset.UTC); JobSchedulerService.sElapsedRealtimeClock = Clock.fixed(SystemClock.elapsedRealtimeClock().instant(), ZoneOffset.UTC); diff --git a/services/tests/mockingservicestests/src/com/android/server/job/controllers/TimeControllerTest.java b/services/tests/mockingservicestests/src/com/android/server/job/controllers/TimeControllerTest.java index 19369dbe5f44b..70b7bb6249206 100644 --- a/services/tests/mockingservicestests/src/com/android/server/job/controllers/TimeControllerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/job/controllers/TimeControllerTest.java @@ -105,7 +105,7 @@ public class TimeControllerTest { JobSchedulerService.sSystemClock = Clock.fixed(Clock.systemUTC().instant(), ZoneOffset.UTC); JobSchedulerService.sUptimeMillisClock = - Clock.fixed(SystemClock.uptimeMillisClock().instant(), ZoneOffset.UTC); + Clock.fixed(SystemClock.uptimeClock().instant(), ZoneOffset.UTC); JobSchedulerService.sElapsedRealtimeClock = Clock.fixed(SystemClock.elapsedRealtimeClock().instant(), ZoneOffset.UTC); diff --git a/services/tests/servicestests/src/com/android/server/job/JobStoreTest.java b/services/tests/servicestests/src/com/android/server/job/JobStoreTest.java index 604637a2a8bc0..0309dbeea2ca1 100644 --- a/services/tests/servicestests/src/com/android/server/job/JobStoreTest.java +++ b/services/tests/servicestests/src/com/android/server/job/JobStoreTest.java @@ -85,7 +85,7 @@ public class JobStoreTest { JobSchedulerService.sSystemClock = Clock.fixed(Clock.systemUTC().instant(), ZoneOffset.UTC); JobSchedulerService.sUptimeMillisClock = - Clock.fixed(SystemClock.uptimeMillisClock().instant(), ZoneOffset.UTC); + Clock.fixed(SystemClock.uptimeClock().instant(), ZoneOffset.UTC); JobSchedulerService.sElapsedRealtimeClock = Clock.fixed(SystemClock.elapsedRealtimeClock().instant(), ZoneOffset.UTC); }