Merge "Revert "Provide the current auto-brightness levels in DisplayOffloadSession"" into main (25512fb6) · Commits · e / os / android_frameworks_base

core/java/android/hardware/display/DisplayManagerInternal.java

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -751,13 +751,6 @@ public abstract class DisplayManagerInternal {
	*/		*/
	boolean blockScreenOn(Runnable unblocker);		boolean blockScreenOn(Runnable unblocker);

	/** Get the current brightness levels used to determine automatic brightness based on lux
	* levels. */
	float[] getCurrentAutoBrightnessLevels();

	/** Get the current lux levels used to determine automatic brightness. */
	float[] getCurrentAutoBrightnessLuxLevels();

	/** Returns whether displayoffload supports the given display state. */		/** Returns whether displayoffload supports the given display state. */
	static boolean isSupportedOffloadState(int displayState) {		static boolean isSupportedOffloadState(int displayState) {
	return Display.isSuspendedState(displayState);		return Display.isSuspendedState(displayState);

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

+11 −13

Original line number	Original line	Diff line number	Diff line
	@@ -403,8 +403,7 @@ public class AutomaticBrightnessController {
	\| (!mAmbientLuxValid ? BrightnessEvent.FLAG_INVALID_LUX : 0)		\| (!mAmbientLuxValid ? BrightnessEvent.FLAG_INVALID_LUX : 0)
	\| (mDisplayPolicy == DisplayPowerRequest.POLICY_DOZE		\| (mDisplayPolicy == DisplayPowerRequest.POLICY_DOZE
	? BrightnessEvent.FLAG_DOZE_SCALE : 0)		? BrightnessEvent.FLAG_DOZE_SCALE : 0)
	\| (getMode() == AUTO_BRIGHTNESS_MODE_IDLE		\| (isInIdleMode() ? BrightnessEvent.FLAG_IDLE_CURVE : 0));
	? BrightnessEvent.FLAG_IDLE_CURVE : 0));
	}		}

	if (!mAmbientLuxValid) {		if (!mAmbientLuxValid) {
	@@ -515,8 +514,7 @@ public class AutomaticBrightnessController {
	if (mLoggingEnabled) {		if (mLoggingEnabled) {
	Slog.d(TAG, "Display policy transitioning from " + oldPolicy + " to " + policy);		Slog.d(TAG, "Display policy transitioning from " + oldPolicy + " to " + policy);
	}		}
	if (!isInteractivePolicy(policy) && isInteractivePolicy(oldPolicy)		if (!isInteractivePolicy(policy) && isInteractivePolicy(oldPolicy) && !isInIdleMode()) {
	&& getMode() != AUTO_BRIGHTNESS_MODE_IDLE) {
	mHandler.sendEmptyMessageDelayed(MSG_INVALIDATE_CURRENT_SHORT_TERM_MODEL,		mHandler.sendEmptyMessageDelayed(MSG_INVALIDATE_CURRENT_SHORT_TERM_MODEL,
	mCurrentBrightnessMapper.getShortTermModelTimeout());		mCurrentBrightnessMapper.getShortTermModelTimeout());
	} else if (isInteractivePolicy(policy) && !isInteractivePolicy(oldPolicy)) {		} else if (isInteractivePolicy(policy) && !isInteractivePolicy(oldPolicy)) {
	@@ -557,7 +555,7 @@ public class AutomaticBrightnessController {
	boolean shouldResetShortTermModel) {		boolean shouldResetShortTermModel) {
	if (mBrightnessMappingStrategyMap.get(AUTO_BRIGHTNESS_MODE_DEFAULT)		if (mBrightnessMappingStrategyMap.get(AUTO_BRIGHTNESS_MODE_DEFAULT)
	.setBrightnessConfiguration(configuration)) {		.setBrightnessConfiguration(configuration)) {
	if (getMode() != AUTO_BRIGHTNESS_MODE_IDLE && shouldResetShortTermModel) {		if (!isInIdleMode() && shouldResetShortTermModel) {
	resetShortTermModel();		resetShortTermModel();
	}		}
	return true;		return true;
	@@ -565,9 +563,8 @@ public class AutomaticBrightnessController {
	return false;		return false;
	}		}

	@AutomaticBrightnessController.AutomaticBrightnessMode		public boolean isInIdleMode() {
	public int getMode() {		return mCurrentBrightnessMapper.getMode() == AUTO_BRIGHTNESS_MODE_IDLE;
	return mCurrentBrightnessMapper.getMode();
	}		}

	public void dump(PrintWriter pw) {		public void dump(PrintWriter pw) {
	@@ -623,7 +620,8 @@ public class AutomaticBrightnessController {
	pw.println(" mPendingForegroundAppPackageName=" + mPendingForegroundAppPackageName);		pw.println(" mPendingForegroundAppPackageName=" + mPendingForegroundAppPackageName);
	pw.println(" mForegroundAppCategory=" + mForegroundAppCategory);		pw.println(" mForegroundAppCategory=" + mForegroundAppCategory);
	pw.println(" mPendingForegroundAppCategory=" + mPendingForegroundAppCategory);		pw.println(" mPendingForegroundAppCategory=" + mPendingForegroundAppCategory);
	pw.println(" Current mode=" + autoBrightnessModeToString(getMode()));		pw.println(" Current mode="
			+ autoBrightnessModeToString(mCurrentBrightnessMapper.getMode()));

	pw.println();		pw.println();
	for (int i = 0; i < mBrightnessMappingStrategyMap.size(); i++) {		for (int i = 0; i < mBrightnessMappingStrategyMap.size(); i++) {
	@@ -745,7 +743,7 @@ public class AutomaticBrightnessController {
	lux = 0;		lux = 0;
	}		}
	mAmbientLux = lux;		mAmbientLux = lux;
	if (getMode() == AUTO_BRIGHTNESS_MODE_IDLE) {		if (isInIdleMode()) {
	mAmbientBrighteningThreshold =		mAmbientBrighteningThreshold =
	mAmbientBrightnessThresholdsIdle.getBrighteningThreshold(lux);		mAmbientBrightnessThresholdsIdle.getBrighteningThreshold(lux);
	mAmbientDarkeningThreshold =		mAmbientDarkeningThreshold =
	@@ -837,7 +835,7 @@ public class AutomaticBrightnessController {
	}		}
	earliestValidTime = mAmbientLightRingBuffer.getTime(i);		earliestValidTime = mAmbientLightRingBuffer.getTime(i);
	}		}
	return earliestValidTime + (getMode() == AUTO_BRIGHTNESS_MODE_IDLE		return earliestValidTime + (isInIdleMode()
	? mBrighteningLightDebounceConfigIdle : mBrighteningLightDebounceConfig);		? mBrighteningLightDebounceConfigIdle : mBrighteningLightDebounceConfig);
	}		}

	@@ -850,7 +848,7 @@ public class AutomaticBrightnessController {
	}		}
	earliestValidTime = mAmbientLightRingBuffer.getTime(i);		earliestValidTime = mAmbientLightRingBuffer.getTime(i);
	}		}
	return earliestValidTime + (getMode() == AUTO_BRIGHTNESS_MODE_IDLE		return earliestValidTime + (isInIdleMode()
	? mDarkeningLightDebounceConfigIdle : mDarkeningLightDebounceConfig);		? mDarkeningLightDebounceConfigIdle : mDarkeningLightDebounceConfig);
	}		}

	@@ -975,7 +973,7 @@ public class AutomaticBrightnessController {
	mPreThresholdBrightness = mScreenAutoBrightness;		mPreThresholdBrightness = mScreenAutoBrightness;
	}		}
	mScreenAutoBrightness = newScreenAutoBrightness;		mScreenAutoBrightness = newScreenAutoBrightness;
	if (getMode() == AUTO_BRIGHTNESS_MODE_IDLE) {		if (isInIdleMode()) {
	mScreenBrighteningThreshold = clampScreenBrightness(		mScreenBrighteningThreshold = clampScreenBrightness(
	mScreenBrightnessThresholdsIdle.getBrighteningThreshold(		mScreenBrightnessThresholdsIdle.getBrighteningThreshold(
	newScreenAutoBrightness));		newScreenAutoBrightness));

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

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -65,16 +65,6 @@ public class DisplayOffloadSessionImpl implements DisplayManagerInternal.Display
	return true;		return true;
	}		}

	@Override
	public float[] getCurrentAutoBrightnessLevels() {
	return mDisplayPowerController.getCurrentAutoBrightnessLevels();
	}

	@Override
	public float[] getCurrentAutoBrightnessLuxLevels() {
	return mDisplayPowerController.getCurrentAutoBrightnessLuxLevels();
	}

	/**		/**
	* Start the offload session. The method returns if the session is already active.		* Start the offload session. The method returns if the session is already active.
	* @return Whether the session was started successfully		* @return Whether the session was started successfully

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

+3 −16

Original line number	Original line	Diff line number	Diff line
	@@ -1119,7 +1119,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
	DisplayPowerState.SCREEN_BRIGHTNESS_FLOAT,		DisplayPowerState.SCREEN_BRIGHTNESS_FLOAT,
	DisplayPowerState.SCREEN_SDR_BRIGHTNESS_FLOAT);		DisplayPowerState.SCREEN_SDR_BRIGHTNESS_FLOAT);
	setAnimatorRampSpeeds(mAutomaticBrightnessController != null		setAnimatorRampSpeeds(mAutomaticBrightnessController != null
	&& mAutomaticBrightnessController.getMode() == AUTO_BRIGHTNESS_MODE_IDLE);		&& mAutomaticBrightnessController.isInIdleMode());
	mScreenBrightnessRampAnimator.setListener(mRampAnimatorListener);		mScreenBrightnessRampAnimator.setListener(mRampAnimatorListener);

	noteScreenState(mPowerState.getScreenState());		noteScreenState(mPowerState.getScreenState());
	@@ -1990,8 +1990,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
	boolean isIncreasing = animateValue > currentBrightness;		boolean isIncreasing = animateValue > currentBrightness;
	final float rampSpeed;		final float rampSpeed;
	final boolean idle = mAutomaticBrightnessController != null		final boolean idle = mAutomaticBrightnessController != null
	&& mAutomaticBrightnessController.getMode()		&& mAutomaticBrightnessController.isInIdleMode();
	== AUTO_BRIGHTNESS_MODE_IDLE;
	if (isIncreasing && slowChange) {		if (isIncreasing && slowChange) {
	rampSpeed = idle ? mBrightnessRampRateSlowIncreaseIdle		rampSpeed = idle ? mBrightnessRampRateSlowIncreaseIdle
	: mBrightnessRampRateSlowIncrease;		: mBrightnessRampRateSlowIncrease;
	@@ -2214,18 +2213,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
	// The old DPC is no longer supported		// The old DPC is no longer supported
	}		}

	@Override
	public float[] getCurrentAutoBrightnessLevels() {
	// The old DPC is no longer supported
	return new float[0];
	}

	@Override
	public float[] getCurrentAutoBrightnessLuxLevels() {
	// The old DPC is no longer supported
	return new float[0];
	}

	@Override		@Override
	public BrightnessInfo getBrightnessInfo() {		public BrightnessInfo getBrightnessInfo() {
	synchronized (mCachedBrightnessInfo) {		synchronized (mCachedBrightnessInfo) {
	@@ -2911,7 +2898,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
	// or the nits is invalid.		// or the nits is invalid.
	if (brightnessIsTemporary		if (brightnessIsTemporary
	\|\| mAutomaticBrightnessController == null		\|\| mAutomaticBrightnessController == null
	\|\| mAutomaticBrightnessController.getMode() == AUTO_BRIGHTNESS_MODE_IDLE		\|\| mAutomaticBrightnessController.isInIdleMode()
	\|\| !autobrightnessEnabled		\|\| !autobrightnessEnabled
	\|\| mBrightnessTracker == null		\|\| mBrightnessTracker == null
	\|\| !mUseAutoBrightness		\|\| !mUseAutoBrightness

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

+4 −17

Original line number	Original line	Diff line number	Diff line
	@@ -951,7 +951,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal
	DisplayPowerState.SCREEN_BRIGHTNESS_FLOAT,		DisplayPowerState.SCREEN_BRIGHTNESS_FLOAT,
	DisplayPowerState.SCREEN_SDR_BRIGHTNESS_FLOAT);		DisplayPowerState.SCREEN_SDR_BRIGHTNESS_FLOAT);
	setAnimatorRampSpeeds(mAutomaticBrightnessController != null		setAnimatorRampSpeeds(mAutomaticBrightnessController != null
	&& mAutomaticBrightnessController.getMode() == AUTO_BRIGHTNESS_MODE_IDLE);		&& mAutomaticBrightnessController.isInIdleMode());
	mScreenBrightnessRampAnimator.setListener(mRampAnimatorListener);		mScreenBrightnessRampAnimator.setListener(mRampAnimatorListener);

	noteScreenState(mPowerState.getScreenState());		noteScreenState(mPowerState.getScreenState());
	@@ -1365,7 +1365,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal

	// Switch to doze auto-brightness mode if needed		// Switch to doze auto-brightness mode if needed
	if (mFlags.areAutoBrightnessModesEnabled() && mAutomaticBrightnessController != null		if (mFlags.areAutoBrightnessModesEnabled() && mAutomaticBrightnessController != null
	&& mAutomaticBrightnessController.getMode() != AUTO_BRIGHTNESS_MODE_IDLE) {		&& !mAutomaticBrightnessController.isInIdleMode()) {
	setAutomaticScreenBrightnessMode(Display.isDozeState(state)		setAutomaticScreenBrightnessMode(Display.isDozeState(state)
	? AUTO_BRIGHTNESS_MODE_DOZE : AUTO_BRIGHTNESS_MODE_DEFAULT);		? AUTO_BRIGHTNESS_MODE_DOZE : AUTO_BRIGHTNESS_MODE_DEFAULT);
	}		}
	@@ -1654,8 +1654,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal
	boolean isIncreasing = animateValue > currentBrightness;		boolean isIncreasing = animateValue > currentBrightness;
	final float rampSpeed;		final float rampSpeed;
	final boolean idle = mAutomaticBrightnessController != null		final boolean idle = mAutomaticBrightnessController != null
	&& mAutomaticBrightnessController.getMode()		&& mAutomaticBrightnessController.isInIdleMode();
	== AUTO_BRIGHTNESS_MODE_IDLE;
	if (isIncreasing && slowChange) {		if (isIncreasing && slowChange) {
	rampSpeed = idle ? mBrightnessRampRateSlowIncreaseIdle		rampSpeed = idle ? mBrightnessRampRateSlowIncreaseIdle
	: mBrightnessRampRateSlowIncrease;		: mBrightnessRampRateSlowIncrease;
	@@ -1886,18 +1885,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal
	mHandler.sendMessageAtTime(msg, mClock.uptimeMillis());		mHandler.sendMessageAtTime(msg, mClock.uptimeMillis());
	}		}

	@Override
	public float[] getCurrentAutoBrightnessLevels() {
	return mDisplayDeviceConfig.getAutoBrightnessBrighteningLevels(
	mAutomaticBrightnessController.getMode());
	}

	@Override
	public float[] getCurrentAutoBrightnessLuxLevels() {
	return mDisplayDeviceConfig.getAutoBrightnessBrighteningLevelsLux(
	mAutomaticBrightnessController.getMode());
	}

	@Override		@Override
	public BrightnessInfo getBrightnessInfo() {		public BrightnessInfo getBrightnessInfo() {
	synchronized (mCachedBrightnessInfo) {		synchronized (mCachedBrightnessInfo) {
	@@ -2473,7 +2460,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal
	// or the nits is invalid.		// or the nits is invalid.
	if (brightnessIsTemporary		if (brightnessIsTemporary
	\|\| mAutomaticBrightnessController == null		\|\| mAutomaticBrightnessController == null
	\|\| mAutomaticBrightnessController.getMode() == AUTO_BRIGHTNESS_MODE_IDLE		\|\| mAutomaticBrightnessController.isInIdleMode()
	\|\| !autobrightnessEnabled		\|\| !autobrightnessEnabled
	\|\| mBrightnessTracker == null		\|\| mBrightnessTracker == null
	\|\| !shouldUseAutoBrightness		\|\| !shouldUseAutoBrightness