Merge "Clean up enable_screen_timeout_policy_listener_api flag" into main (f07841b1) · Commits · e / os / android_frameworks_base

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

+1 −17

Original line number	Diff line number	Diff line
		@@ -1429,9 +1429,7 @@ public final class PowerManagerService extends SystemService
		DisplayGroupPowerChangeListener displayGroupPowerChangeListener =
		new DisplayGroupPowerChangeListener();
		mDisplayManagerInternal.registerDisplayGroupListener(displayGroupPowerChangeListener);
		if (mFeatureFlags.isScreenTimeoutPolicyListenerApiEnabled()) {
		mDisplayManager.registerDisplayListener(new DisplayListener(), mHandler);
		}

		if (mDreamManager != null) {
		// This DreamManager method does not acquire a lock, so it should be safe to call.
		@@ -4087,10 +4085,6 @@ public final class PowerManagerService extends SystemService

		@GuardedBy("mLock")
		private void notifyScreenTimeoutPolicyChangesLocked() {
		if (!mFeatureFlags.isScreenTimeoutPolicyListenerApiEnabled()) {
		return;
		}

		for (int idx = 0; idx < mPowerGroups.size(); idx++) {
		final int powerGroupId = mPowerGroups.keyAt(idx);
		final PowerGroup powerGroup = mPowerGroups.valueAt(idx);
		@@ -6335,11 +6329,6 @@ public final class PowerManagerService extends SystemService
		@Override // Binder call
		public void addScreenTimeoutPolicyListener(int displayId,
		IScreenTimeoutPolicyListener listener) {
		if (!mFeatureFlags.isScreenTimeoutPolicyListenerApiEnabled()) {
		throw new IllegalStateException("Screen timeout policy listener API flag "
		+ "is not enabled");
		}

		mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER,
		null);

		@@ -6371,11 +6360,6 @@ public final class PowerManagerService extends SystemService
		@Override // Binder call
		public void removeScreenTimeoutPolicyListener(int displayId,
		IScreenTimeoutPolicyListener listener) {
		if (!mFeatureFlags.isScreenTimeoutPolicyListenerApiEnabled()) {
		throw new IllegalStateException("Screen timeout policy listener API flag "
		+ "is not enabled");
		}

		mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER,
		null);

services/core/java/com/android/server/power/feature/PowerManagerFlags.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -37,11 +37,6 @@ public class PowerManagerFlags {
		Flags.FLAG_ENABLE_EARLY_SCREEN_TIMEOUT_DETECTOR,
		Flags::enableEarlyScreenTimeoutDetector);

		private final FlagState mEnableScreenTimeoutPolicyListenerApi = new FlagState(
		Flags.FLAG_ENABLE_SCREEN_TIMEOUT_POLICY_LISTENER_API,
		Flags::enableScreenTimeoutPolicyListenerApi
		);

		private final FlagState mImproveWakelockLatency = new FlagState(
		Flags.FLAG_IMPROVE_WAKELOCK_LATENCY,
		Flags::improveWakelockLatency
		@@ -99,11 +94,6 @@ public class PowerManagerFlags {
		return mEarlyScreenTimeoutDetectorFlagState.isEnabled();
		}

		/** Returns whether screen timeout policy listener APIs are enabled on not. */
		public boolean isScreenTimeoutPolicyListenerApiEnabled() {
		return mEnableScreenTimeoutPolicyListenerApi.isEnabled();
		}

		/**
		* @return Whether to improve the wakelock acquire/release latency or not
		*/

services/core/java/com/android/server/power/feature/power_flags.aconfig

+0 −11

Original line number	Diff line number	Diff line
		@@ -11,17 +11,6 @@ flag {
		is_fixed_read_only: true
		}

		flag {
		name: "enable_screen_timeout_policy_listener_api"
		namespace: "power"
		description: "Enables APIs that allow to listen to screen timeout policy changes"
		bug: "363174979"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "separate_timeouts_flicker"
		namespace: "lse_desktop_experience"

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

+0 −22

Original line number	Diff line number	Diff line
		@@ -4465,25 +4465,6 @@ public class PowerManagerServiceTest {
		}

		@Test
		@DisableFlags(Flags.FLAG_ENABLE_SCREEN_TIMEOUT_POLICY_LISTENER_API)
		public void testAcquireWakelock_screenTimeoutListenersDisabled_noCrashes() {
		IntArray displayGroupIds = IntArray.wrap(new int[]{Display.DEFAULT_DISPLAY_GROUP});
		when(mDisplayManagerInternalMock.getDisplayGroupIds()).thenReturn(displayGroupIds);

		final DisplayInfo displayInfo = new DisplayInfo();
		displayInfo.displayGroupId = Display.DEFAULT_DISPLAY_GROUP;
		when(mDisplayManagerInternalMock.getDisplayInfo(Display.DEFAULT_DISPLAY))
		.thenReturn(displayInfo);

		createService();
		startSystem();

		acquireWakeLock("screenBright", PowerManager.SCREEN_BRIGHT_WAKE_LOCK,
		Display.DEFAULT_DISPLAY);
		}

		@Test
		@EnableFlags(Flags.FLAG_ENABLE_SCREEN_TIMEOUT_POLICY_LISTENER_API)
		public void testAddWakeLockKeepingScreenOn_addsToNotifierAndReportsTimeoutPolicyChange() {
		IntArray displayGroupIds = IntArray.wrap(new int[]{Display.DEFAULT_DISPLAY_GROUP});
		when(mDisplayManagerInternalMock.getDisplayGroupIds()).thenReturn(displayGroupIds);
		@@ -4511,7 +4492,6 @@ public class PowerManagerServiceTest {
		}

		@Test
		@EnableFlags(Flags.FLAG_ENABLE_SCREEN_TIMEOUT_POLICY_LISTENER_API)
		public void test_addAndRemoveScreenTimeoutListener_propagatesToNotifier()
		throws Exception {
		IntArray displayGroupIds = IntArray.wrap(new int[]{Display.DEFAULT_DISPLAY_GROUP});
		@@ -4538,7 +4518,6 @@ public class PowerManagerServiceTest {
		}

		@Test
		@EnableFlags(Flags.FLAG_ENABLE_SCREEN_TIMEOUT_POLICY_LISTENER_API)
		public void test_displayIsRemoved_clearsScreenTimeoutListeners()
		throws Exception {
		IntArray displayGroupIds = IntArray.wrap(new int[]{Display.DEFAULT_DISPLAY_GROUP});
		@@ -4561,7 +4540,6 @@ public class PowerManagerServiceTest {
		}

		@Test
		@EnableFlags(Flags.FLAG_ENABLE_SCREEN_TIMEOUT_POLICY_LISTENER_API)
		public void testScreenTimeoutListener_screenHasWakelocks_addsWithHeldTimeoutPolicyToNotifier()
		throws Exception {
		IntArray displayGroupIds = IntArray.wrap(new int[]{Display.DEFAULT_DISPLAY_GROUP});