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	Diff line number	Diff line
		@@ -751,13 +751,6 @@ public abstract class DisplayManagerInternal {
		*/
		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. */
		static boolean isSupportedOffloadState(int displayState) {
		return Display.isSuspendedState(displayState);

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

+11 −13

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

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

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

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

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

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

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

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

+0 −10

Original line number	Diff line number	Diff line
		@@ -65,16 +65,6 @@ public class DisplayOffloadSessionImpl implements DisplayManagerInternal.Display
		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.
		* @return Whether the session was started successfully

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

+3 −16

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

		noteScreenState(mPowerState.getScreenState());
		@@ -1990,8 +1990,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
		boolean isIncreasing = animateValue > currentBrightness;
		final float rampSpeed;
		final boolean idle = mAutomaticBrightnessController != null
		&& mAutomaticBrightnessController.getMode()
		== AUTO_BRIGHTNESS_MODE_IDLE;
		&& mAutomaticBrightnessController.isInIdleMode();
		if (isIncreasing && slowChange) {
		rampSpeed = idle ? mBrightnessRampRateSlowIncreaseIdle
		: mBrightnessRampRateSlowIncrease;
		@@ -2214,18 +2213,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
		// 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
		public BrightnessInfo getBrightnessInfo() {
		synchronized (mCachedBrightnessInfo) {
		@@ -2911,7 +2898,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
		// or the nits is invalid.
		if (brightnessIsTemporary
		\|\| mAutomaticBrightnessController == null
		\|\| mAutomaticBrightnessController.getMode() == AUTO_BRIGHTNESS_MODE_IDLE
		\|\| mAutomaticBrightnessController.isInIdleMode()
		\|\| !autobrightnessEnabled
		\|\| mBrightnessTracker == null
		\|\| !mUseAutoBrightness

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

+4 −17

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

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

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

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

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

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