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

Commit e493e603 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove SystemClock.uptimeMillisClock()."

parents 9ee86f62 bde8ba41

api/removed.txt

+0 −1
Original line number Diff line number Diff line
@@ -344,7 +344,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 {

core/java/android/os/SystemClock.java

+0 −8
Original line number Diff line number Diff line
@@ -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.

services/core/java/com/android/server/job/JobSchedulerService.java

+1 −1
Original line number Diff line number Diff line
@@ -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();

services/tests/mockingservicestests/src/com/android/server/job/controllers/ConnectivityControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

services/tests/mockingservicestests/src/com/android/server/job/controllers/JobStatusTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

    }