Merge "Finalize virtual_power_group_sleep_no_doze flag." into main (8dd7db5a) · Commits · e / os / android_frameworks_base

core/java/android/companion/virtual/flags/flags.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -132,16 +132,6 @@ flag {
		}
		}

		flag {
		name: "virtual_power_group_sleep_no_doze"
		namespace: "virtual_devices"
		description: "Sleep non-default power groups directly, skipping doze"
		bug: "416220040"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "migrate_viewconfiguration_constants_to_resources"
		namespace: "virtual_devices"

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -2330,8 +2330,7 @@ public final class PowerManagerService extends SystemService
		@GuardedBy("mLock")
		private boolean dozePowerGroupLocked(final PowerGroup powerGroup, long eventTime,
		@GoToSleepReason int reason, int uid, boolean allowSleepToDozeTransition) {
		if (powerGroup.getGroupId() != Display.DEFAULT_DISPLAY_GROUP
		&& android.companion.virtualdevice.flags.Flags.virtualPowerGroupSleepNoDoze()) {
		if (powerGroup.getGroupId() != Display.DEFAULT_DISPLAY_GROUP) {
		return sleepPowerGroupLocked(powerGroup, eventTime, reason, uid);
		}

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

+3 −18

Original line number	Diff line number	Diff line
		@@ -1878,15 +1878,10 @@ public class PowerManagerServiceTest {

		advanceTime(10000);

		int expectedNonDefaultGroupWakefullness =
		android.companion.virtualdevice.flags.Flags.virtualPowerGroupSleepNoDoze()
		? WAKEFULNESS_ASLEEP
		: WAKEFULNESS_DOZING;

		assertThat(mService.getWakefulnessLocked(Display.DEFAULT_DISPLAY_GROUP))
		.isEqualTo(WAKEFULNESS_ASLEEP);
		assertThat(mService.getWakefulnessLocked(nonDefaultDisplayGroupId))
		.isEqualTo(expectedNonDefaultGroupWakefullness);
		.isEqualTo(WAKEFULNESS_ASLEEP);
		}

		@EnableFlags(android.companion.virtualdevice.flags.Flags.FLAG_DEVICE_AWARE_DISPLAY_POWER)
		@@ -2620,16 +2615,11 @@ public class PowerManagerServiceTest {

		advanceTime(15000);

		int expectedNonDefaultGroupWakefullness =
		android.companion.virtualdevice.flags.Flags.virtualPowerGroupSleepNoDoze()
		? WAKEFULNESS_ASLEEP
		: WAKEFULNESS_DOZING;

		assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_AWAKE);
		assertThat(mService.getWakefulnessLocked(Display.DEFAULT_DISPLAY_GROUP)).isEqualTo(
		WAKEFULNESS_AWAKE);
		assertThat(mService.getWakefulnessLocked(nonDefaultDisplayGroupId)).isEqualTo(
		expectedNonDefaultGroupWakefullness);
		WAKEFULNESS_ASLEEP);
		}

		@Test
		@@ -3258,16 +3248,11 @@ public class PowerManagerServiceTest {

		advanceTime(15000);

		int expectedNonDefaultGroupWakefullness =
		android.companion.virtualdevice.flags.Flags.virtualPowerGroupSleepNoDoze()
		? WAKEFULNESS_ASLEEP
		: WAKEFULNESS_DOZING;

		// Only the default display group is dreaming.
		assertThat(mService.getWakefulnessLocked(Display.DEFAULT_DISPLAY_GROUP)).isEqualTo(
		WAKEFULNESS_DREAMING);
		assertThat(mService.getWakefulnessLocked(nonDefaultDisplayGroupId)).isEqualTo(
		expectedNonDefaultGroupWakefullness);
		WAKEFULNESS_ASLEEP);
		assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_DREAMING);
		}