Merge "Add HDR-HBM support into framework." into sc-dev am: 35ab69b632 am: 19bfdafbba (46492d73) · Commits · e / os / android_frameworks_base

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

+23 −1

Original line number	Original line	Diff line number	Diff line
	@@ -33,7 +33,8 @@ public final class BrightnessInfo implements Parcelable {

	@IntDef(prefix = {"HIGH_BRIGHTNESS_MODE_"}, value = {		@IntDef(prefix = {"HIGH_BRIGHTNESS_MODE_"}, value = {
	HIGH_BRIGHTNESS_MODE_OFF,		HIGH_BRIGHTNESS_MODE_OFF,
	HIGH_BRIGHTNESS_MODE_SUNLIGHT		HIGH_BRIGHTNESS_MODE_SUNLIGHT,
			HIGH_BRIGHTNESS_MODE_HDR
	})		})
	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	public @interface HighBrightnessMode {}		public @interface HighBrightnessMode {}
	@@ -50,6 +51,12 @@ public final class BrightnessInfo implements Parcelable {
	*/		*/
	public static final int HIGH_BRIGHTNESS_MODE_SUNLIGHT = 1;		public static final int HIGH_BRIGHTNESS_MODE_SUNLIGHT = 1;

			/**
			* High brightness mode is ON due to high ambient light (sunlight). The high brightness range is
			* currently accessible to the user.
			*/
			public static final int HIGH_BRIGHTNESS_MODE_HDR = 2;

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

	@@ -73,6 +80,21 @@ public final class BrightnessInfo implements Parcelable {
	this.highBrightnessMode = highBrightnessMode;		this.highBrightnessMode = highBrightnessMode;
	}		}

			/**
			* @return User-friendly string for specified {@link HighBrightnessMode} parameter.
			*/
			public static String hbmToString(@HighBrightnessMode int highBrightnessMode) {
			switch (highBrightnessMode) {
			case HIGH_BRIGHTNESS_MODE_OFF:
			return "off";
			case HIGH_BRIGHTNESS_MODE_HDR:
			return "hdr";
			case HIGH_BRIGHTNESS_MODE_SUNLIGHT:
			return "sunlight";
			}
			return "invalid";
			}

	@Override		@Override
	public int describeContents() {		public int describeContents() {
	return 0;		return 0;

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

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -738,13 +738,19 @@ class AutomaticBrightnessController {
	float value = mBrightnessMapper.getBrightness(mAmbientLux, mForegroundAppPackageName,		float value = mBrightnessMapper.getBrightness(mAmbientLux, mForegroundAppPackageName,
	mForegroundAppCategory);		mForegroundAppCategory);
	float newScreenAutoBrightness = clampScreenBrightness(value);		float newScreenAutoBrightness = clampScreenBrightness(value);

			// The min/max range can change for brightness due to HBM. See if the current brightness
			// value still falls within the current range (which could have changed).
			final boolean currentBrightnessWithinAllowedRange = BrightnessSynchronizer.floatEquals(
			mScreenAutoBrightness, clampScreenBrightness(mScreenAutoBrightness));
	// If screenAutoBrightness is set, we should have screen{Brightening,Darkening}Threshold,		// If screenAutoBrightness is set, we should have screen{Brightening,Darkening}Threshold,
	// in which case we ignore the new screen brightness if it doesn't differ enough from the		// in which case we ignore the new screen brightness if it doesn't differ enough from the
	// previous one.		// previous one.
	if (!Float.isNaN(mScreenAutoBrightness)		if (!Float.isNaN(mScreenAutoBrightness)
	&& !isManuallySet		&& !isManuallySet
	&& newScreenAutoBrightness > mScreenDarkeningThreshold		&& newScreenAutoBrightness > mScreenDarkeningThreshold
	&& newScreenAutoBrightness < mScreenBrighteningThreshold) {		&& newScreenAutoBrightness < mScreenBrighteningThreshold
			&& currentBrightnessWithinAllowedRange) {
	if (mLoggingEnabled) {		if (mLoggingEnabled) {
	Slog.d(TAG, "ignoring newScreenAutoBrightness: "		Slog.d(TAG, "ignoring newScreenAutoBrightness: "
	+ mScreenDarkeningThreshold + " < " + newScreenAutoBrightness		+ mScreenDarkeningThreshold + " < " + newScreenAutoBrightness

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

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,5 +20,8 @@ package com.android.server.display;
	* Interface used to update the actual display state.		* Interface used to update the actual display state.
	*/		*/
	public interface DisplayBlanker {		public interface DisplayBlanker {
	void requestDisplayState(int displayId, int state, float brightness);		/**
			* Requests the specified display state and brightness levels for the specified displayId.
			*/
			void requestDisplayState(int displayId, int state, float brightness, float sdrBrightness);
	}		}

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

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -156,10 +156,12 @@ abstract class DisplayDevice {
	*		*
	* @param state The new display state.		* @param state The new display state.
	* @param brightnessState The new display brightnessState.		* @param brightnessState The new display brightnessState.
			* @param sdrBrightnessState The new display brightnessState for SDR layers.
	* @return A runnable containing work to be deferred until after we have		* @return A runnable containing work to be deferred until after we have
	* exited the critical section, or null if none.		* exited the critical section, or null if none.
	*/		*/
	public Runnable requestDisplayStateLocked(int state, float brightnessState) {		public Runnable requestDisplayStateLocked(int state, float brightnessState,
			float sdrBrightnessState) {
	return null;		return null;
	}		}

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

+23 −0

Original line number	Original line	Diff line number	Diff line
	@@ -104,6 +104,7 @@ public class DisplayDeviceConfig {
	private float mBrightnessRampSlowIncrease = Float.NaN;		private float mBrightnessRampSlowIncrease = Float.NaN;
	private Spline mBrightnessToBacklightSpline;		private Spline mBrightnessToBacklightSpline;
	private Spline mBacklightToBrightnessSpline;		private Spline mBacklightToBrightnessSpline;
			private Spline mBacklightToNitsSpline;
	private List<String> mQuirks;		private List<String> mQuirks;
	private boolean mIsHighBrightnessModeEnabled = false;		private boolean mIsHighBrightnessModeEnabled = false;
	private HighBrightnessModeData mHbmData;		private HighBrightnessModeData mHbmData;
	@@ -218,6 +219,20 @@ public class DisplayDeviceConfig {
	return mBrightnessToBacklightSpline.interpolate(brightness);		return mBrightnessToBacklightSpline.interpolate(brightness);
	}		}

			/**
			* Calculates the nits value for the specified backlight value if a mapping exists.
			*
			* @return The mapped nits or 0 if no mapping exits.
			*/
			public float getNitsFromBacklight(float backlight) {
			if (mBacklightToNitsSpline == null) {
			Slog.wtf(TAG, "requesting nits when no mapping exists.");
			return -1;
			}
			backlight = Math.max(backlight, mBacklightMinimum);
			return mBacklightToNitsSpline.interpolate(backlight);
			}

	/**		/**
	* Return an array of equal length to backlight and nits, that covers the entire system		* Return an array of equal length to backlight and nits, that covers the entire system
	* brightness range of 0.0-1.0.		* brightness range of 0.0-1.0.
	@@ -257,6 +272,13 @@ public class DisplayDeviceConfig {
	return mAmbientLightSensor;		return mAmbientLightSensor;
	}		}

			/**
			* @return true if a nits to backlight mapping is defined in this config, false otherwise.
			*/
			public boolean hasNitsMapping() {
			return mBacklightToNitsSpline != null;
			}

	/**		/**
	* @param quirkValue The quirk to test.		* @param quirkValue The quirk to test.
	* @return {@code true} if the specified quirk is present in this configuration,		* @return {@code true} if the specified quirk is present in this configuration,
	@@ -584,6 +606,7 @@ public class DisplayDeviceConfig {
	}		}
	mBrightnessToBacklightSpline = Spline.createSpline(mBrightness, mBacklight);		mBrightnessToBacklightSpline = Spline.createSpline(mBrightness, mBacklight);
	mBacklightToBrightnessSpline = Spline.createSpline(mBacklight, mBrightness);		mBacklightToBrightnessSpline = Spline.createSpline(mBacklight, mBrightness);
			mBacklightToNitsSpline = Spline.createSpline(mBacklight, mNits);
	}		}

	private void loadQuirks(DisplayConfiguration config) {		private void loadQuirks(DisplayConfiguration config) {