Merge "Create separate timeouts flag" into main (4f7b6c24) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/display/feature/DisplayManagerFlags.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -280,6 +280,11 @@ public class DisplayManagerFlags {
		Flags::committedStateSeparateEvent
		);

		private final FlagState mSeparateTimeouts = new FlagState(
		Flags.FLAG_SEPARATE_TIMEOUTS,
		Flags::separateTimeouts
		);

		private final FlagState mDelayImplicitRrRegistrationUntilRrAccessed = new FlagState(
		Flags.FLAG_DELAY_IMPLICIT_RR_REGISTRATION_UNTIL_RR_ACCESSED,
		Flags::delayImplicitRrRegistrationUntilRrAccessed
		@@ -607,6 +612,14 @@ public class DisplayManagerFlags {
		return mCommittedStateSeparateEvent.isEnabled();
		}

		/**
		* @return {@code true} if the flag for having a separate timeouts for power groups
		* is enabled
		*/
		public boolean isSeparateTimeoutsEnabled() {
		return mSeparateTimeouts.isEnabled();
		}

		/**
		* @return {@code true} if the flag for only explicit subscription for RR changes is enabled
		*/
		@@ -671,6 +684,7 @@ public class DisplayManagerFlags {
		pw.println(" " + mFramerateOverrideTriggersRrCallbacks);
		pw.println(" " + mRefreshRateEventForForegroundApps);
		pw.println(" " + mCommittedStateSeparateEvent);
		pw.println(" " + mSeparateTimeouts);
		pw.println(" " + mDelayImplicitRrRegistrationUntilRrAccessed);
		}

+8 −0

Original line number	Diff line number	Diff line
		@@ -509,6 +509,14 @@ flag {
		}
		}


		flag {
		name: "separate_timeouts"
		namespace: "lse_desktop_experience"
		description: "Allow separate timeouts for different power groups"
		bug: "402356291"
		}

		flag {
		name: "delay_implicit_rr_registration_until_rr_accessed"
		namespace: "display_manager"