Merge "Use elapsed real time for sleep duration for the wake up with home intent" (63baeffd) · Commits · e / os / android_frameworks_base

core/java/android/os/PowerManager.java

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -715,28 +715,28 @@ public final class PowerManager {
	* @hide		* @hide
	*/		*/
	public static class WakeData {		public static class WakeData {
	public WakeData(long wakeTime, @WakeReason int wakeReason, long sleepDuration) {		public WakeData(long wakeTime, @WakeReason int wakeReason, long sleepDurationRealtime) {
	this.wakeTime = wakeTime;		this.wakeTime = wakeTime;
	this.wakeReason = wakeReason;		this.wakeReason = wakeReason;
	this.sleepDuration = sleepDuration;		this.sleepDurationRealtime = sleepDurationRealtime;
	}		}
	public final long wakeTime;		public final long wakeTime;
	public final @WakeReason int wakeReason;		public final @WakeReason int wakeReason;
	public final long sleepDuration;		public final long sleepDurationRealtime;

	@Override		@Override
	public boolean equals(@Nullable Object o) {		public boolean equals(@Nullable Object o) {
	if (o instanceof WakeData) {		if (o instanceof WakeData) {
	final WakeData other = (WakeData) o;		final WakeData other = (WakeData) o;
	return wakeTime == other.wakeTime && wakeReason == other.wakeReason		return wakeTime == other.wakeTime && wakeReason == other.wakeReason
	&& sleepDuration == other.sleepDuration;		&& sleepDurationRealtime == other.sleepDurationRealtime;
	}		}
	return false;		return false;
	}		}

	@Override		@Override
	public int hashCode() {		public int hashCode() {
	return Objects.hash(wakeTime, wakeReason, sleepDuration);		return Objects.hash(wakeTime, wakeReason, sleepDurationRealtime);
	}		}
	}		}

services/core/java/com/android/server/policy/PhoneWindowManager.java

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -4585,12 +4585,13 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	return false;		return false;
	}		}

	final long sleepDuration = mPowerManagerInternal.getLastWakeup().sleepDuration;		final long sleepDurationRealtime =
			mPowerManagerInternal.getLastWakeup().sleepDurationRealtime;
	if (DEBUG_WAKEUP) {		if (DEBUG_WAKEUP) {
	Log.i(TAG, "shouldWakeUpWithHomeIntent: sleepDuration= " + sleepDuration		Log.i(TAG, "shouldWakeUpWithHomeIntent: sleepDurationRealtime= " + sleepDurationRealtime
	+ " mWakeUpToLastStateTimeout= " + mWakeUpToLastStateTimeout);		+ " mWakeUpToLastStateTimeout= " + mWakeUpToLastStateTimeout);
	}		}
	return sleepDuration > mWakeUpToLastStateTimeout;		return sleepDurationRealtime > mWakeUpToLastStateTimeout;
	}		}

	private void wakeUpFromPowerKey(long eventTime) {		private void wakeUpFromPowerKey(long eventTime) {

services/core/java/com/android/server/power/PowerManagerService.java

+31 −6

Original line number	Original line	Diff line number	Diff line
	@@ -376,6 +376,10 @@ public final class PowerManagerService extends SystemService
	private long mLastGlobalWakeTime;		private long mLastGlobalWakeTime;
	private long mLastGlobalSleepTime;		private long mLastGlobalSleepTime;

			// Timestamp (in the elapsed realtime timebase) of the last time was awoken or put to sleep.
			private long mLastGlobalWakeTimeRealtime;
			private long mLastGlobalSleepTimeRealtime;

	// Last reason the device went to sleep.		// Last reason the device went to sleep.
	private @WakeReason int mLastGlobalWakeReason;		private @WakeReason int mLastGlobalWakeReason;
	private @GoToSleepReason int mLastGlobalSleepReason;		private @GoToSleepReason int mLastGlobalSleepReason;
	@@ -927,6 +931,11 @@ public final class PowerManagerService extends SystemService
	* Returns current time in milliseconds since boot, not counting time spent in deep sleep.		* Returns current time in milliseconds since boot, not counting time spent in deep sleep.
	*/		*/
	long uptimeMillis();		long uptimeMillis();

			/**
			* Returns milliseconds since boot, including time spent in sleep.
			*/
			long elapsedRealtime();
	}		}

	@VisibleForTesting		@VisibleForTesting
	@@ -1005,7 +1014,18 @@ public final class PowerManagerService extends SystemService
	}		}

	Clock createClock() {		Clock createClock() {
	return SystemClock::uptimeMillis;		return new Clock() {
			@Override
			public long uptimeMillis() {
			return SystemClock.uptimeMillis();
			}

			@Override
			public long elapsedRealtime() {
			return SystemClock.elapsedRealtime();
			}
			};

	}		}

	/**		/**
	@@ -2141,6 +2161,7 @@ public final class PowerManagerService extends SystemService
	+ ")...");		+ ")...");
	mLastGlobalWakeTime = eventTime;		mLastGlobalWakeTime = eventTime;
	mLastGlobalWakeReason = reason;		mLastGlobalWakeReason = reason;
			mLastGlobalWakeTimeRealtime = mClock.elapsedRealtime();
	break;		break;

	case WAKEFULNESS_DREAMING:		case WAKEFULNESS_DREAMING:
	@@ -2152,9 +2173,9 @@ public final class PowerManagerService extends SystemService
	traceMethodName = "goToSleep";		traceMethodName = "goToSleep";
	Slog.i(TAG, "Going to sleep due to " + PowerManager.sleepReasonToString(reason)		Slog.i(TAG, "Going to sleep due to " + PowerManager.sleepReasonToString(reason)
	+ " (uid " + uid + ")...");		+ " (uid " + uid + ")...");

	mLastGlobalSleepTime = eventTime;		mLastGlobalSleepTime = eventTime;
	mLastGlobalSleepReason = reason;		mLastGlobalSleepReason = reason;
			mLastGlobalSleepTimeRealtime = mClock.elapsedRealtime();
	mDozeStartInProgress = true;		mDozeStartInProgress = true;
	break;		break;

	@@ -4404,6 +4425,10 @@ public final class PowerManagerService extends SystemService
	pw.println(" mLastSleepTime=" + TimeUtils.formatUptime(mLastGlobalSleepTime));		pw.println(" mLastSleepTime=" + TimeUtils.formatUptime(mLastGlobalSleepTime));
	pw.println(" mLastSleepReason=" + PowerManager.sleepReasonToString(		pw.println(" mLastSleepReason=" + PowerManager.sleepReasonToString(
	mLastGlobalSleepReason));		mLastGlobalSleepReason));
			pw.println(" mLastGlobalWakeTimeRealtime="
			+ TimeUtils.formatUptime(mLastGlobalWakeTimeRealtime));
			pw.println(" mLastGlobalSleepTimeRealtime="
			+ TimeUtils.formatUptime(mLastGlobalSleepTimeRealtime));
	pw.println(" mLastInteractivePowerHintTime="		pw.println(" mLastInteractivePowerHintTime="
	+ TimeUtils.formatUptime(mLastInteractivePowerHintTime));		+ TimeUtils.formatUptime(mLastInteractivePowerHintTime));
	pw.println(" mLastScreenBrightnessBoostTime="		pw.println(" mLastScreenBrightnessBoostTime="
	@@ -5886,7 +5911,7 @@ public final class PowerManagerService extends SystemService
	boolean isPersonalized) {		boolean isPersonalized) {
	// Get current time before acquiring the lock so that the calculated end time is as		// Get current time before acquiring the lock so that the calculated end time is as
	// accurate as possible.		// accurate as possible.
	final long nowElapsed = SystemClock.elapsedRealtime();		final long nowElapsed = mClock.elapsedRealtime();
	if (mContext.checkCallingOrSelfPermission(		if (mContext.checkCallingOrSelfPermission(
	android.Manifest.permission.BATTERY_PREDICTION)		android.Manifest.permission.BATTERY_PREDICTION)
	!= PackageManager.PERMISSION_GRANTED) {		!= PackageManager.PERMISSION_GRANTED) {
	@@ -5950,7 +5975,7 @@ public final class PowerManagerService extends SystemService
	synchronized (mEnhancedDischargeTimeLock) {		synchronized (mEnhancedDischargeTimeLock) {
	// Get current time after acquiring the lock so that the calculated duration		// Get current time after acquiring the lock so that the calculated duration
	// is as accurate as possible.		// is as accurate as possible.
	final long nowElapsed = SystemClock.elapsedRealtime();		final long nowElapsed = mClock.elapsedRealtime();
	if (isEnhancedDischargePredictionValidLocked(nowElapsed)) {		if (isEnhancedDischargePredictionValidLocked(nowElapsed)) {
	return new ParcelDuration(mEnhancedDischargeTimeElapsed - nowElapsed);		return new ParcelDuration(mEnhancedDischargeTimeElapsed - nowElapsed);
	}		}
	@@ -5969,7 +5994,7 @@ public final class PowerManagerService extends SystemService
	final long ident = Binder.clearCallingIdentity();		final long ident = Binder.clearCallingIdentity();
	try {		try {
	synchronized (mEnhancedDischargeTimeLock) {		synchronized (mEnhancedDischargeTimeLock) {
	return isEnhancedDischargePredictionValidLocked(SystemClock.elapsedRealtime())		return isEnhancedDischargePredictionValidLocked(mClock.elapsedRealtime())
	&& mEnhancedDischargePredictionIsPersonalized;		&& mEnhancedDischargePredictionIsPersonalized;
	}		}
	} finally {		} finally {
	@@ -6459,7 +6484,7 @@ public final class PowerManagerService extends SystemService
	private PowerManager.WakeData getLastWakeupInternal() {		private PowerManager.WakeData getLastWakeupInternal() {
	synchronized (mLock) {		synchronized (mLock) {
	return new PowerManager.WakeData(mLastGlobalWakeTime, mLastGlobalWakeReason,		return new PowerManager.WakeData(mLastGlobalWakeTime, mLastGlobalWakeReason,
	mLastGlobalWakeTime - mLastGlobalSleepTime);		mLastGlobalWakeTimeRealtime - mLastGlobalSleepTimeRealtime);
	}		}
	}		}

services/tests/mockingservicestests/src/com/android/server/power/PowerManagerServiceMockingTest.java

+11 −1

Original line number	Original line	Diff line number	Diff line
	@@ -223,7 +223,17 @@ public class PowerManagerServiceMockingTest {

	@Override		@Override
	PowerManagerService.Clock createClock() {		PowerManagerService.Clock createClock() {
	return () -> mClock.now();		return new PowerManagerService.Clock() {
			@Override
			public long uptimeMillis() {
			return mClock.now();
			}

			@Override
			public long elapsedRealtime() {
			return mClock.now();
			}
			};
	}		}

	@Override		@Override

services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java

+19 −5

Original line number	Original line	Diff line number	Diff line
	@@ -158,6 +158,7 @@ public class PowerManagerServiceTest {
	private UserSwitchedReceiver mUserSwitchedReceiver;		private UserSwitchedReceiver mUserSwitchedReceiver;
	private Resources mResourcesSpy;		private Resources mResourcesSpy;
	private OffsettableClock mClock;		private OffsettableClock mClock;
			private long mLastElapsedRealtime;
	private TestLooper mTestLooper;		private TestLooper mTestLooper;

	private static class IntentFilterMatcher implements ArgumentMatcher<IntentFilter> {		private static class IntentFilterMatcher implements ArgumentMatcher<IntentFilter> {
	@@ -286,7 +287,18 @@ public class PowerManagerServiceTest {

	@Override		@Override
	PowerManagerService.Clock createClock() {		PowerManagerService.Clock createClock() {
	return () -> mClock.now();		return new PowerManagerService.Clock() {
			@Override
			public long uptimeMillis() {
			return mClock.now();
			}

			@Override
			public long elapsedRealtime() {
			mLastElapsedRealtime = mClock.now();
			return mLastElapsedRealtime;
			}
			};
	}		}

	@Override		@Override
	@@ -1686,6 +1698,7 @@ public class PowerManagerServiceTest {

	mService.setWakefulnessLocked(nonDefaultPowerGroupId, WAKEFULNESS_DOZING, eventTime2,		mService.setWakefulnessLocked(nonDefaultPowerGroupId, WAKEFULNESS_DOZING, eventTime2,
	0, PowerManager.GO_TO_SLEEP_REASON_APPLICATION, 0, null, null);		0, PowerManager.GO_TO_SLEEP_REASON_APPLICATION, 0, null, null);
			long eventElapsedRealtime1 = mLastElapsedRealtime;
	assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_DOZING);		assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_DOZING);
	assertThat(mService.getBinderServiceInstance().getLastSleepReason()).isEqualTo(		assertThat(mService.getBinderServiceInstance().getLastSleepReason()).isEqualTo(
	PowerManager.GO_TO_SLEEP_REASON_APPLICATION);		PowerManager.GO_TO_SLEEP_REASON_APPLICATION);
	@@ -1693,19 +1706,20 @@ public class PowerManagerServiceTest {
	mService.setWakefulnessLocked(Display.DEFAULT_DISPLAY_GROUP, WAKEFULNESS_AWAKE,		mService.setWakefulnessLocked(Display.DEFAULT_DISPLAY_GROUP, WAKEFULNESS_AWAKE,
	eventTime3, /* uid= / 0, PowerManager.WAKE_REASON_PLUGGED_IN, / opUid= */		eventTime3, /* uid= / 0, PowerManager.WAKE_REASON_PLUGGED_IN, / opUid= */
	0, /* opPackageName= / null, / details= */ null);		0, /* opPackageName= / null, / details= */ null);
			long eventElapsedRealtime2 = mLastElapsedRealtime;
	PowerManager.WakeData wakeData = mService.getLocalServiceInstance().getLastWakeup();		PowerManager.WakeData wakeData = mService.getLocalServiceInstance().getLastWakeup();
	assertThat(wakeData.wakeTime).isEqualTo(eventTime3);		assertThat(wakeData.wakeTime).isEqualTo(eventTime3);
	assertThat(wakeData.wakeReason).isEqualTo(PowerManager.WAKE_REASON_PLUGGED_IN);		assertThat(wakeData.wakeReason).isEqualTo(PowerManager.WAKE_REASON_PLUGGED_IN);
	assertThat(wakeData.sleepDuration).isEqualTo(eventTime3 - eventTime2);		assertThat(wakeData.sleepDurationRealtime)
			.isEqualTo(eventElapsedRealtime2 - eventElapsedRealtime1);

	// The global wake time and reason as well as sleep duration shouldn't change when another		// The global wake time and reason as well as sleep duration shouldn't change when another
	// PowerGroup wakes up.		// PowerGroup wakes up.
	mService.setWakefulnessLocked(nonDefaultPowerGroupId, WAKEFULNESS_AWAKE,		mService.setWakefulnessLocked(nonDefaultPowerGroupId, WAKEFULNESS_AWAKE,
	eventTime4, /* uid= / 0, PowerManager.WAKE_REASON_CAMERA_LAUNCH, / opUid= */		eventTime4, /* uid= / 0, PowerManager.WAKE_REASON_CAMERA_LAUNCH, / opUid= */
	0, /* opPackageName= / null, / details= */ null);		0, /* opPackageName= / null, / details= */ null);
	assertThat(wakeData.wakeTime).isEqualTo(eventTime3);		PowerManager.WakeData wakeData2 = mService.getLocalServiceInstance().getLastWakeup();
	assertThat(wakeData.wakeReason).isEqualTo(PowerManager.WAKE_REASON_PLUGGED_IN);		assertThat(wakeData2).isEqualTo(wakeData);
	assertThat(wakeData.sleepDuration).isEqualTo(eventTime3 - eventTime2);
	}		}

	@Test		@Test