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

Commit bde8ba41 authored Jun 17, 2019 by Kweku Adams

Remove SystemClock.uptimeMillisClock().

It was marked @removed in Pie. Now removing it from the code.

Bug: 135214188
Test: atest FrameworksMockingServicesTests
Change-Id: Id8bdf28d8d10a767f54af1bf421185e179c0379a

parent a94ba372

api/removed.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -375,7 +375,6 @@ package android.os {
	public final class SystemClock {		public final class SystemClock {
	method @NonNull public static java.time.Clock elapsedRealtimeClock();		method @NonNull public static java.time.Clock elapsedRealtimeClock();
	method @NonNull public static java.time.Clock uptimeClock();		method @NonNull public static java.time.Clock uptimeClock();
	method @Deprecated @NonNull public static java.time.Clock uptimeMillisClock();
	}		}

	public class TestLooperManager {		public class TestLooperManager {

core/java/android/os/SystemClock.java

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -176,14 +176,6 @@ public final class SystemClock {
	@CriticalNative		@CriticalNative
	native public static long uptimeMillis();		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		* Return {@link Clock} that starts at system boot, not counting time spent
	* in deep sleep.		* in deep sleep.

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -150,7 +150,7 @@ public class JobSchedulerService extends com.android.server.SystemService
	@VisibleForTesting		@VisibleForTesting
	public static Clock sSystemClock = Clock.systemUTC();		public static Clock sSystemClock = Clock.systemUTC();
	@VisibleForTesting		@VisibleForTesting
	public static Clock sUptimeMillisClock = SystemClock.uptimeMillisClock();		public static Clock sUptimeMillisClock = SystemClock.uptimeClock();
	@VisibleForTesting		@VisibleForTesting
	public static Clock sElapsedRealtimeClock = SystemClock.elapsedRealtimeClock();		public static Clock sElapsedRealtimeClock = SystemClock.elapsedRealtimeClock();

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -109,7 +109,7 @@ public class ConnectivityControllerTest {
	JobSchedulerService.sSystemClock =		JobSchedulerService.sSystemClock =
	Clock.fixed(Clock.systemUTC().instant(), ZoneOffset.UTC);		Clock.fixed(Clock.systemUTC().instant(), ZoneOffset.UTC);
	JobSchedulerService.sUptimeMillisClock =		JobSchedulerService.sUptimeMillisClock =
	Clock.fixed(SystemClock.uptimeMillisClock().instant(), ZoneOffset.UTC);		Clock.fixed(SystemClock.uptimeClock().instant(), ZoneOffset.UTC);
	JobSchedulerService.sElapsedRealtimeClock =		JobSchedulerService.sElapsedRealtimeClock =
	Clock.fixed(SystemClock.elapsedRealtimeClock().instant(), ZoneOffset.UTC);		Clock.fixed(SystemClock.elapsedRealtimeClock().instant(), ZoneOffset.UTC);

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -82,7 +82,7 @@ public class JobStatusTest {
	JobSchedulerService.sSystemClock =		JobSchedulerService.sSystemClock =
	Clock.fixed(Clock.systemUTC().instant(), ZoneOffset.UTC);		Clock.fixed(Clock.systemUTC().instant(), ZoneOffset.UTC);
	JobSchedulerService.sUptimeMillisClock =		JobSchedulerService.sUptimeMillisClock =
	Clock.fixed(SystemClock.uptimeMillisClock().instant(), ZoneOffset.UTC);		Clock.fixed(SystemClock.uptimeClock().instant(), ZoneOffset.UTC);
	JobSchedulerService.sElapsedRealtimeClock =		JobSchedulerService.sElapsedRealtimeClock =
	Clock.fixed(SystemClock.elapsedRealtimeClock().instant(), ZoneOffset.UTC);		Clock.fixed(SystemClock.elapsedRealtimeClock().instant(), ZoneOffset.UTC);
	}		}