Merge "Wakelock Summary - Sleeplock" into main (304c9007) · Commits · e / os / android_frameworks_base

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

+32 −3

Original line number	Diff line number	Diff line
		@@ -2249,6 +2249,14 @@ public final class PowerManagerService extends SystemService
		}
		}

		// whether a wake lock summary means device is being kept asleep.
		// will prevent power groups from leaving state of being asleep
		private boolean hasWakeLockKeepingGroupAsleep(int wakeLockSummary) {
		Slog.i(TAG, "Preventing waking device, due to wakelocks: 0x"
		+ Integer.toHexString(wakeLockSummary));
		return (wakeLockSummary & (WAKE_LOCK_PARTIAL_SLEEP)) != 0;
		}

		@GuardedBy("mLock")
		private void wakePowerGroupLocked(final PowerGroup powerGroup, long eventTime,
		@WakeReason int reason, String details, int uid, String opPackageName, int opUid) {
		@@ -2257,13 +2265,22 @@ public final class PowerManagerService extends SystemService
		+ ", groupId=" + powerGroup.getGroupId()
		+ ", reason=" + PowerManager.wakeReasonToString(reason) + ", uid=" + uid);
		}
		if (mForceSuspendActive \|\| !mSystemReady \|\| (powerGroup == null)) {
		if (mForceSuspendActive \|\| !mSystemReady \|\| (powerGroup == null)
		\|\| hasWakeLockKeepingGroupAsleep(powerGroup.getWakeLockSummaryLocked())) {
		return;
		}
		powerGroup.wakeUpLocked(eventTime, reason, details, uid, opPackageName, opUid,
		LatencyTracker.getInstance(mContext));
		}

		@VisibleForTesting
		void dreamPowerGroupLocked(int groupId, long eventTime, int uid, boolean allowWake) {
		PowerGroup powerGroup = mPowerGroups.get(groupId);
		if (powerGroup != null) {
		dreamPowerGroupLocked(powerGroup, eventTime, uid, allowWake);
		}
		}

		@GuardedBy("mLock")
		private boolean dreamPowerGroupLocked(PowerGroup powerGroup, long eventTime, int uid,
		boolean allowWake) {
		@@ -2271,7 +2288,8 @@ public final class PowerManagerService extends SystemService
		Slog.d(TAG, "dreamPowerGroup: groupId=" + powerGroup.getGroupId() + ", eventTime="
		+ eventTime + ", uid=" + uid);
		}
		if (!mBootCompleted \|\| !mSystemReady) {
		if (!mBootCompleted \|\| !mSystemReady
		\|\| hasWakeLockKeepingGroupAsleep(powerGroup.getWakeLockSummaryLocked())) {
		return false;
		}
		return powerGroup.dreamLocked(eventTime, uid, allowWake);
		@@ -2318,7 +2336,8 @@ public final class PowerManagerService extends SystemService
		+ ", reason=" + PowerManager.sleepReasonToString(reason) + ", uid=" + uid);
		}

		if (!mSystemReady \|\| !mBootCompleted) {
		if (!mSystemReady \|\| !mBootCompleted
		\|\| hasWakeLockKeepingGroupAsleep(powerGroup.getWakeLockSummaryLocked())) {
		return false;
		}

		@@ -2938,6 +2957,16 @@ public final class PowerManagerService extends SystemService
		wakeLockSummary &= ~WAKE_LOCK_PROXIMITY_SCREEN_OFF;
		}
		}
		if (wakefulness != WAKEFULNESS_ASLEEP) {
		// remove this wakelock if we're not already asleep
		wakeLockSummary &= ~WAKE_LOCK_PARTIAL_SLEEP;
		}

		// this wakelock supersedes others - and is not compatible with others - so remove them.
		// this wakelock also holds cpu awake in conjunction with it.
		if ((wakeLockSummary & WAKE_LOCK_PARTIAL_SLEEP) != 0) {
		wakeLockSummary = WAKE_LOCK_PARTIAL_SLEEP \| WAKE_LOCK_CPU;
		}

		// Infer implied wake locks where necessary based on the current state.
		if ((wakeLockSummary & (WAKE_LOCK_SCREEN_BRIGHT \| WAKE_LOCK_SCREEN_DIM)) != 0) {

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

+252 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ import static android.service.dreams.Flags.FLAG_DREAMS_V2;
		import static com.android.server.deviceidle.Flags.FLAG_DISABLE_WAKELOCKS_IN_LIGHT_IDLE;

		import static com.google.common.truth.Truth.assertThat;
		import static com.google.common.truth.Truth.assertWithMessage;

		import static org.junit.Assert.assertFalse;
		import static org.junit.Assert.assertTrue;
		@@ -655,6 +656,257 @@ public class PowerManagerServiceTest {
		PowerManager.GO_TO_SLEEP_FLAG_SOFT_SLEEP);
		assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_AWAKE);
		}

		@RequiresFlagsEnabled(Flags.FLAG_PARTIAL_SLEEP_WAKELOCKS)
		@Test
		public void testPartialSleepWakelock_keepsDeviceAsleep() {
		createService();
		startSystem();

		// Go to sleep (force full sleep - not doze)
		mService.getBinderServiceInstance().goToSleep(mClock.now(),
		PowerManager.GO_TO_SLEEP_REASON_APPLICATION,
		PowerManager.GO_TO_SLEEP_FLAG_NO_DOZE);
		advanceTime(1000);

		assertWithMessage("Device is not setup as asleep")
		.that(mService.getGlobalWakefulnessLocked())
		.isEqualTo(WAKEFULNESS_ASLEEP);

		// Grab a wakelock
		final String tag = "sleeplock1";
		final String packageName = "pkg.name";
		final IBinder token = new Binder();
		final int flags = PowerManager.PARTIAL_SLEEP_WAKE_LOCK;
		mService.getBinderServiceInstance().acquireWakeLock(token, flags, tag, packageName,
		null /* workSource /, null / historyTag */, Display.INVALID_DISPLAY,
		null /* callback */);

		// try to wake up, should fail to wake
		mService.getBinderServiceInstance().wakeUp(mClock.now(),
		PowerManager.WAKE_REASON_WAKE_KEY, "", "");
		advanceTime(1000);

		assertWithMessage("Device did not stay asleep")
		.that(mService.getGlobalWakefulnessLocked())
		.isEqualTo(WAKEFULNESS_ASLEEP);

		mService.getBinderServiceInstance().releaseWakeLock(token, /* flags= */ 0);
		}

		@RequiresFlagsEnabled(Flags.FLAG_PARTIAL_SLEEP_WAKELOCKS)
		@Test
		public void testPartialSleepWakelock_isRememberedFromAwakeToAsleep() {
		createService();
		startSystem();

		assertWithMessage("Device is not setup as awake")
		.that(mService.getGlobalWakefulnessLocked())
		.isEqualTo(WAKEFULNESS_AWAKE);

		// Grab a wakelock
		final String tag = "sleeplock1";
		final String packageName = "pkg.name";
		final IBinder token = new Binder();
		final int flags = PowerManager.PARTIAL_SLEEP_WAKE_LOCK;
		mService.getBinderServiceInstance().acquireWakeLock(token, flags, tag, packageName,
		null /* workSource /, null / historyTag */, Display.INVALID_DISPLAY,
		null /* callback */);

		mService.getBinderServiceInstance().goToSleep(mClock.now(),
		PowerManager.GO_TO_SLEEP_REASON_APPLICATION,
		PowerManager.GO_TO_SLEEP_FLAG_NO_DOZE);
		advanceTime(1000);

		assertWithMessage("Device did not go to sleep")
		.that(mService.getGlobalWakefulnessLocked())
		.isEqualTo(WAKEFULNESS_ASLEEP);

		// try to wake up, should fail to wake
		mService.getBinderServiceInstance().wakeUp(mClock.now(),
		PowerManager.WAKE_REASON_WAKE_KEY, "", "");
		advanceTime(1000);

		assertWithMessage("Device did not stay asleep")
		.that(mService.getGlobalWakefulnessLocked())
		.isEqualTo(WAKEFULNESS_ASLEEP);
		mService.getBinderServiceInstance().releaseWakeLock(token, /* flags= */ 0);

		}

		@RequiresFlagsEnabled(Flags.FLAG_PARTIAL_SLEEP_WAKELOCKS)
		@Test
		public void testPartialSleepWakelock_ignoresOtherWakingWakelocks() {
		createService();
		startSystem();

		// Go to sleep (force full sleep - not doze)
		mService.getBinderServiceInstance().goToSleep(mClock.now(),
		PowerManager.GO_TO_SLEEP_REASON_APPLICATION,
		PowerManager.GO_TO_SLEEP_FLAG_NO_DOZE);
		advanceTime(1000);

		assertWithMessage("Device is not setup as asleep")
		.that(mService.getGlobalWakefulnessLocked())
		.isEqualTo(WAKEFULNESS_ASLEEP);

		// Grab a wakelock
		final String tag = "sleeplock1";
		final String packageName = "pkg.name";
		final IBinder token = new Binder();
		final int flags = PowerManager.PARTIAL_SLEEP_WAKE_LOCK;
		mService.getBinderServiceInstance().acquireWakeLock(token, flags, tag, packageName,
		null /* workSource /, null / historyTag */, Display.INVALID_DISPLAY,
		null /* callback */);
		advanceTime(1000);

		// Grab a wakelock that should wake the device
		final String tag2 = "fullAndCausesWakeup";
		final String packageName2 = "pkg.name2";
		final IBinder token2 = new Binder();
		final int flags2 = PowerManager.FULL_WAKE_LOCK \| PowerManager.ACQUIRE_CAUSES_WAKEUP;
		mService.getBinderServiceInstance().acquireWakeLock(token2, flags2, tag2, packageName2,
		null /* workSource /, null / historyTag */, Display.INVALID_DISPLAY,
		null /* callback */);

		assertWithMessage("Sleeplock did not supersede full wakelock with acquire")
		.that(mService.getGlobalWakefulnessLocked())
		.isEqualTo(WAKEFULNESS_ASLEEP);
		}

		@RequiresFlagsEnabled(Flags.FLAG_PARTIAL_SLEEP_WAKELOCKS)
		@Test
		public void testPartialSleepWakelock_requestNewWakefulnessKeepsDeviceAsleep() {
		createService();
		startSystem();

		// Go to sleep (force full sleep - not doze)
		mService.getBinderServiceInstance().goToSleep(mClock.now(),
		PowerManager.GO_TO_SLEEP_REASON_APPLICATION,
		PowerManager.GO_TO_SLEEP_FLAG_NO_DOZE);
		advanceTime(1000);

		assertWithMessage("Device is not setup as asleep")
		.that(mService.getGlobalWakefulnessLocked())
		.isEqualTo(WAKEFULNESS_ASLEEP);

		// Grab a wakelock
		final String tag = "sleeplock1";
		final String packageName = "pkg.name";
		final IBinder token = new Binder();
		final int flags = PowerManager.PARTIAL_SLEEP_WAKE_LOCK;
		mService.getBinderServiceInstance().acquireWakeLock(token, flags, tag, packageName,
		null /* workSource /, null / historyTag */, Display.INVALID_DISPLAY,
		null /* callback */);
		advanceTime(1000);

		// test switch to doze
		mService.dozePowerGroupLocked(Display.DEFAULT_DISPLAY_GROUP, mClock.now(),
		PowerManager.GO_TO_SLEEP_REASON_SLEEP_BUTTON, 1000, true);
		advanceTime(1000);

		assertWithMessage("Device did not stay - switch to doze")
		.that(mService.getGlobalWakefulnessLocked())
		.isEqualTo(WAKEFULNESS_ASLEEP);

		// test switch to awake
		mService.getBinderServiceInstance().wakeUp(mClock.now(),
		PowerManager.WAKE_REASON_WAKE_KEY, "", "");
		advanceTime(1000);

		assertWithMessage("Device did not stay asleep - switch to awake")
		.that(mService.getGlobalWakefulnessLocked())
		.isEqualTo(WAKEFULNESS_ASLEEP);

		// test switch to dream
		mService.dreamPowerGroupLocked(Display.DEFAULT_DISPLAY_GROUP,
		mClock.now(), /* uid= / 1000, / allowWake= */true);
		advanceTime(1000);

		assertWithMessage("Device did not stay asleep - switch to dream")
		.that(mService.getGlobalWakefulnessLocked())
		.isEqualTo(WAKEFULNESS_ASLEEP);

		mService.getBinderServiceInstance().releaseWakeLock(token, /* flags= */ 0);
		}

		@RequiresFlagsEnabled(Flags.FLAG_PARTIAL_SLEEP_WAKELOCKS)
		@Test
		public void testPartialSleepWakelock_multiplePowerGroups() {
		// setup
		final int nonDefaultPowerGroupId = Display.DEFAULT_DISPLAY_GROUP + 1;
		int displayInNonDefaultGroup = 1;
		final AtomicReference<DisplayManagerInternal.DisplayGroupListener> listener =
		new AtomicReference<>();
		long eventTime1 = 10;
		final DisplayInfo info = new DisplayInfo();
		info.displayGroupId = Display.DEFAULT_DISPLAY_GROUP;
		when(mDisplayManagerInternalMock.getDisplayInfo(Display.DEFAULT_DISPLAY)).thenReturn(info);
		doAnswer((Answer<Void>) invocation -> {
		listener.set(invocation.getArgument(0));
		return null;
		}).when(mDisplayManagerInternalMock).registerDisplayGroupListener(any());
		createService();
		startSystem();
		listener.get().onDisplayGroupAdded(nonDefaultPowerGroupId);

		// Verify all displays are awake.
		assertThat(mService.getGlobalWakefulnessLocked())
		.isEqualTo(WAKEFULNESS_AWAKE);
		assertThat(mService.getWakefulnessLocked(Display.DEFAULT_DISPLAY_GROUP))
		.isEqualTo(WAKEFULNESS_AWAKE);
		assertThat(mService.getWakefulnessLocked(nonDefaultPowerGroupId))
		.isEqualTo(WAKEFULNESS_AWAKE);

		// Transition default display to doze, and verify the global wakefulness
		mService.setWakefulnessLocked(Display.DEFAULT_DISPLAY_GROUP, WAKEFULNESS_DOZING, eventTime1,
		0, PowerManager.GO_TO_SLEEP_REASON_INATTENTIVE, 0, null, null);
		advanceTime(1000);

		// assert that default group is alseep
		assertWithMessage("Global wakefulness is not awake")
		.that(mService.getGlobalWakefulnessLocked())
		.isEqualTo(WAKEFULNESS_AWAKE);
		assertWithMessage("Default group is not asleep")
		.that(mService.getWakefulnessLocked(Display.DEFAULT_DISPLAY_GROUP))
		.isEqualTo(WAKEFULNESS_ASLEEP);
		assertWithMessage("Secondary group is not awake")
		.that(mService.getWakefulnessLocked(nonDefaultPowerGroupId))
		.isEqualTo(WAKEFULNESS_AWAKE);

		// grab sleeplock on default group
		// Grab a wakelock
		final String tag = "sleeplock1";
		final String packageName = "pkg.name";
		final IBinder token = new Binder();
		final int flags = PowerManager.PARTIAL_SLEEP_WAKE_LOCK;
		mService.getBinderServiceInstance().acquireWakeLock(token, flags, tag, packageName,
		null /* workSource /, null / historyTag */, Display.DEFAULT_DISPLAY,
		null /* callback */);
		advanceTime(1000);

		// try to wake default group
		mService.getBinderServiceInstance().wakeUp(mClock.now(),
		PowerManager.WAKE_REASON_WAKE_KEY, "", "");

		advanceTime(1000);


		// verify default group is still asleep + secondary display is awake
		assertWithMessage("Global wakefulness is not awake")
		.that(mService.getGlobalWakefulnessLocked())
		.isEqualTo(WAKEFULNESS_AWAKE);
		assertWithMessage("Default group is not asleep")
		.that(mService.getWakefulnessLocked(Display.DEFAULT_DISPLAY_GROUP))
		.isEqualTo(WAKEFULNESS_ASLEEP);
		assertWithMessage("Secondary group is not awake")
		.that(mService.getWakefulnessLocked(nonDefaultPowerGroupId))
		.isEqualTo(WAKEFULNESS_AWAKE);

		mService.getBinderServiceInstance().releaseWakeLock(token, /* flags= */ 0);
		}


		@Test
		public void testWakefulnessSleep_SoftSleepFlag_WithScreenDimWakelock() {
		createService();