Merge "Add MINMODE brightness modifier" into main (56844c9f) · Commits · e / os / android_frameworks_base

core/java/android/hardware/display/BrightnessInfo.java

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -64,7 +64,8 @@ public final class BrightnessInfo implements Parcelable {
	BRIGHTNESS_MAX_REASON_THERMAL,		BRIGHTNESS_MAX_REASON_THERMAL,
	BRIGHTNESS_MAX_REASON_POWER_IC,		BRIGHTNESS_MAX_REASON_POWER_IC,
	BRIGHTNESS_MAX_REASON_WEAR_BEDTIME_MODE,		BRIGHTNESS_MAX_REASON_WEAR_BEDTIME_MODE,
	BRIGHTNESS_MAX_REASON_MODES		BRIGHTNESS_MAX_REASON_MODES,
			BRIGHTNESS_MAX_REASON_MINMODE
	})		})
	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	public @interface BrightnessMaxReason {}		public @interface BrightnessMaxReason {}
	@@ -94,6 +95,11 @@ public final class BrightnessInfo implements Parcelable {
	*/		*/
	public static final int BRIGHTNESS_MAX_REASON_MODES = 4;		public static final int BRIGHTNESS_MAX_REASON_MODES = 4;

			/**
			* Maximum brightness is restricted due to the MinMode
			*/
			public static final int BRIGHTNESS_MAX_REASON_MINMODE = 5;

	/** Brightness */		/** Brightness */
	public final float brightness;		public final float brightness;

core/java/android/provider/Settings.java

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20344,6 +20344,13 @@ public final class Settings {
	public static final String WATCH_RANGING_SUPPORTED_BY_PRIMARY_DEVICE =		public static final String WATCH_RANGING_SUPPORTED_BY_PRIMARY_DEVICE =
	"watch_ranging_supported_by_primary_device";		"watch_ranging_supported_by_primary_device";

			/**
			* Indicates whether the device is in minmode.
			*
			* @hide
			*/
			public static final String MINMODE_ACTIVE = "minmode_active";

	/**		/**
	* Settings migrated from Wear OS settings provider.		* Settings migrated from Wear OS settings provider.
	* @hide		* @hide

packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -131,5 +131,6 @@ public class GlobalSettings {
	Settings.Global.USER_SWITCHER_ENABLED,		Settings.Global.USER_SWITCHER_ENABLED,
	Settings.Global.GLOBAL_ACTIONS_TIMEOUT_MILLIS,		Settings.Global.GLOBAL_ACTIONS_TIMEOUT_MILLIS,
	Settings.Global.WATCH_RANGING_SUPPORTED_BY_PRIMARY_DEVICE,		Settings.Global.WATCH_RANGING_SUPPORTED_BY_PRIMARY_DEVICE,
			Settings.Global.MINMODE_ACTIVE,
	};		};
	}		}

packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -483,5 +483,6 @@ public class GlobalSettingsValidators {
	VALIDATORS.put(Global.GLOBAL_ACTIONS_TIMEOUT_MILLIS, NON_NEGATIVE_INTEGER_VALIDATOR);		VALIDATORS.put(Global.GLOBAL_ACTIONS_TIMEOUT_MILLIS, NON_NEGATIVE_INTEGER_VALIDATOR);
	VALIDATORS.put(Global.WATCH_RANGING_SUPPORTED_BY_PRIMARY_DEVICE,		VALIDATORS.put(Global.WATCH_RANGING_SUPPORTED_BY_PRIMARY_DEVICE,
	new InclusiveIntegerRangeValidator(0, 1));		new InclusiveIntegerRangeValidator(0, 1));
			VALIDATORS.put(Global.MINMODE_ACTIVE, BOOLEAN_VALIDATOR);
	}		}
	}		}

services/core/java/com/android/server/display/DisplayDeviceConfig.java

+20 −0

Original line number	Original line	Diff line number	Diff line
	@@ -918,6 +918,11 @@ public class DisplayDeviceConfig {
	*/		*/
	private float mBrightnessCapForWearBedtimeMode;		private float mBrightnessCapForWearBedtimeMode;

			/**
			* Maximum screen brightness setting when screen brightness capped in MinMode.
			*/
			private float mBrightnessCapForMinMode;

	private boolean mVrrSupportEnabled;		private boolean mVrrSupportEnabled;

	@Nullable		@Nullable
	@@ -1697,6 +1702,13 @@ public class DisplayDeviceConfig {
	return mBrightnessCapForWearBedtimeMode;		return mBrightnessCapForWearBedtimeMode;
	}		}

			/**
			* @return Maximum screen brightness setting when screen brightness capped in MinMode.
			*/
			public float getBrightnessCapForMinMode() {
			return mBrightnessCapForMinMode;
			}

	/**		/**
	* @return true if display supports dvrr		* @return true if display supports dvrr
	*/		*/
	@@ -1918,6 +1930,7 @@ public class DisplayDeviceConfig {
	mHdrBrightnessData = HdrBrightnessData.loadConfig(config, transitionPointProvider);		mHdrBrightnessData = HdrBrightnessData.loadConfig(config, transitionPointProvider);
	loadBrightnessCapForWearBedtimeMode(config);		loadBrightnessCapForWearBedtimeMode(config);
	loadIdleScreenRefreshRateTimeoutConfigs(config);		loadIdleScreenRefreshRateTimeoutConfigs(config);
			loadBrightnessCapForMinMode(config);
	mVrrSupportEnabled = config.getSupportsVrr();		mVrrSupportEnabled = config.getSupportsVrr();
	loadDozeBrightness(config);		loadDozeBrightness(config);
	} else {		} else {
	@@ -3063,6 +3076,13 @@ public class DisplayDeviceConfig {
	.config_screenBrightnessCapForWearBedtimeMode));		.config_screenBrightnessCapForWearBedtimeMode));
	}		}

			private void loadBrightnessCapForMinMode(DisplayConfiguration config) {
			HighBrightnessMode hbm = config.getHighBrightnessMode();
			float hbmTransitionPoint = hbm != null ? hbm.getTransitionPoint_all().floatValue()
			: PowerManager.BRIGHTNESS_MAX;
			mBrightnessCapForMinMode = hbmTransitionPoint;
			}

	/**		/**
	* Container for Power throttling configuration data.		* Container for Power throttling configuration data.
	* TODO(b/302814899): extract to separate class.		* TODO(b/302814899): extract to separate class.