Merge "Adding feature flag to enable new external proximity sensor API" into main (828e5840) · Commits · e / os / android_frameworks_base

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

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -86,6 +86,10 @@ public class DisplayManagerFlags {
	Flags.FLAG_BRIGHTNESS_INT_RANGE_USER_PERCEPTION,		Flags.FLAG_BRIGHTNESS_INT_RANGE_USER_PERCEPTION,
	Flags::brightnessIntRangeUserPerception);		Flags::brightnessIntRangeUserPerception);

			private final FlagState mVsyncProximityVote = new FlagState(
			Flags.FLAG_ENABLE_EXTERNAL_VSYNC_PROXIMITY_VOTE,
			Flags::enableExternalVsyncProximityVote);

	/** Returns whether connected display management is enabled or not. */		/** Returns whether connected display management is enabled or not. */
	public boolean isConnectedDisplayManagementEnabled() {		public boolean isConnectedDisplayManagementEnabled() {
	return mConnectedDisplayManagementFlagState.isEnabled();		return mConnectedDisplayManagementFlagState.isEnabled();
	@@ -170,6 +174,10 @@ public class DisplayManagerFlags {
	return mBrightnessIntRangeUserPerceptionFlagState.isEnabled();		return mBrightnessIntRangeUserPerceptionFlagState.isEnabled();
	}		}

			public boolean isExternalVsyncProximityVoteEnabled() {
			return mVsyncProximityVote.isEnabled();
			}

	/**		/**
	* dumps all flagstates		* dumps all flagstates
	* @param pw printWriter		* @param pw printWriter
	@@ -188,6 +196,7 @@ public class DisplayManagerFlags {
	pw.println(" " + mPowerThrottlingClamperFlagState);		pw.println(" " + mPowerThrottlingClamperFlagState);
	pw.println(" " + mSmallAreaDetectionFlagState);		pw.println(" " + mSmallAreaDetectionFlagState);
	pw.println(" " + mBrightnessIntRangeUserPerceptionFlagState);		pw.println(" " + mBrightnessIntRangeUserPerceptionFlagState);
			pw.println(" " + mVsyncProximityVote);
	}		}

	private static class FlagState {		private static class FlagState {

services/core/java/com/android/server/display/feature/display_flags.aconfig

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -112,3 +112,11 @@ flag {
	bug: "183655602"		bug: "183655602"
	is_fixed_read_only: true		is_fixed_read_only: true
	}		}

			flag {
			name: "enable_external_vsync_proximity_vote"
			namespace: "display_manager"
			description: "Feature flag for external vsync proximity vote"
			bug: "284866750"
			is_fixed_read_only: true
			}