Merge changes from topic "NormalBrightnessModeController" into udc-d1-dev (c9b1c893) · Commits · e / os / android_frameworks_base

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

+15 −12

Original line number	Diff line number	Diff line
		@@ -223,11 +223,11 @@ public class AutomaticBrightnessController {
		private final ShortTermModel mShortTermModel;
		private final ShortTermModel mPausedShortTermModel;

		// Controls High Brightness Mode.
		private HighBrightnessModeController mHbmController;
		// Controls Brightness range (including High Brightness Mode).
		private final BrightnessRangeController mBrightnessRangeController;

		// Throttles (caps) maximum allowed brightness
		private BrightnessThrottler mBrightnessThrottler;
		private final BrightnessThrottler mBrightnessThrottler;
		private boolean mIsBrightnessThrottled;

		// Context-sensitive brightness configurations require keeping track of the foreground app's
		@@ -257,7 +257,8 @@ public class AutomaticBrightnessController {
		HysteresisLevels screenBrightnessThresholds,
		HysteresisLevels ambientBrightnessThresholdsIdle,
		HysteresisLevels screenBrightnessThresholdsIdle, Context context,
		HighBrightnessModeController hbmController, BrightnessThrottler brightnessThrottler,
		BrightnessRangeController brightnessModeController,
		BrightnessThrottler brightnessThrottler,
		BrightnessMappingStrategy idleModeBrightnessMapper, int ambientLightHorizonShort,
		int ambientLightHorizonLong, float userLux, float userBrightness) {
		this(new Injector(), callbacks, looper, sensorManager, lightSensor,
		@@ -267,7 +268,7 @@ public class AutomaticBrightnessController {
		darkeningLightDebounceConfig, resetAmbientLuxAfterWarmUpConfig,
		ambientBrightnessThresholds, screenBrightnessThresholds,
		ambientBrightnessThresholdsIdle, screenBrightnessThresholdsIdle, context,
		hbmController, brightnessThrottler, idleModeBrightnessMapper,
		brightnessModeController, brightnessThrottler, idleModeBrightnessMapper,
		ambientLightHorizonShort, ambientLightHorizonLong, userLux, userBrightness
		);
		}
		@@ -283,7 +284,8 @@ public class AutomaticBrightnessController {
		HysteresisLevels screenBrightnessThresholds,
		HysteresisLevels ambientBrightnessThresholdsIdle,
		HysteresisLevels screenBrightnessThresholdsIdle, Context context,
		HighBrightnessModeController hbmController, BrightnessThrottler brightnessThrottler,
		BrightnessRangeController brightnessModeController,
		BrightnessThrottler brightnessThrottler,
		BrightnessMappingStrategy idleModeBrightnessMapper, int ambientLightHorizonShort,
		int ambientLightHorizonLong, float userLux, float userBrightness) {
		mInjector = injector;
		@@ -326,7 +328,7 @@ public class AutomaticBrightnessController {
		mPendingForegroundAppPackageName = null;
		mForegroundAppCategory = ApplicationInfo.CATEGORY_UNDEFINED;
		mPendingForegroundAppCategory = ApplicationInfo.CATEGORY_UNDEFINED;
		mHbmController = hbmController;
		mBrightnessRangeController = brightnessModeController;
		mBrightnessThrottler = brightnessThrottler;
		mInteractiveModeBrightnessMapper = interactiveModeBrightnessMapper;
		mIdleModeBrightnessMapper = idleModeBrightnessMapper;
		@@ -607,10 +609,11 @@ public class AutomaticBrightnessController {

		pw.println();
		pw.println(" mInteractiveMapper=");
		mInteractiveModeBrightnessMapper.dump(pw, mHbmController.getNormalBrightnessMax());
		mInteractiveModeBrightnessMapper.dump(pw,
		mBrightnessRangeController.getNormalBrightnessMax());
		if (mIdleModeBrightnessMapper != null) {
		pw.println(" mIdleMapper=");
		mIdleModeBrightnessMapper.dump(pw, mHbmController.getNormalBrightnessMax());
		mIdleModeBrightnessMapper.dump(pw, mBrightnessRangeController.getNormalBrightnessMax());
		}

		pw.println();
		@@ -736,7 +739,7 @@ public class AutomaticBrightnessController {
		mAmbientDarkeningThreshold =
		mAmbientBrightnessThresholds.getDarkeningThreshold(lux);
		}
		mHbmController.onAmbientLuxChange(mAmbientLux);
		mBrightnessRangeController.onAmbientLuxChange(mAmbientLux);


		// If the short term model was invalidated and the change is drastic enough, reset it.
		@@ -976,9 +979,9 @@ public class AutomaticBrightnessController {

		// Clamps values with float range [0.0-1.0]
		private float clampScreenBrightness(float value) {
		final float minBrightness = Math.min(mHbmController.getCurrentBrightnessMin(),
		final float minBrightness = Math.min(mBrightnessRangeController.getCurrentBrightnessMin(),
		mBrightnessThrottler.getBrightnessCap());
		final float maxBrightness = Math.min(mHbmController.getCurrentBrightnessMax(),
		final float maxBrightness = Math.min(mBrightnessRangeController.getCurrentBrightnessMax(),
		mBrightnessThrottler.getBrightnessCap());
		return MathUtils.constrain(value, minBrightness, maxBrightness);
		}

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

0 → 100644

+126 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.server.display;

		import android.hardware.display.BrightnessInfo;
		import android.os.IBinder;

		import java.io.PrintWriter;
		import java.util.function.BooleanSupplier;

		class BrightnessRangeController {

		private static final boolean NBM_FEATURE_FLAG = false;

		private final HighBrightnessModeController mHbmController;
		private final NormalBrightnessModeController mNormalBrightnessModeController =
		new NormalBrightnessModeController();

		private final Runnable mModeChangeCallback;

		BrightnessRangeController(HighBrightnessModeController hbmController,
		Runnable modeChangeCallback) {
		mHbmController = hbmController;
		mModeChangeCallback = modeChangeCallback;
		}


		void dump(PrintWriter pw) {
		mHbmController.dump(pw);
		}

		void onAmbientLuxChange(float ambientLux) {
		applyChanges(
		() -> mNormalBrightnessModeController.onAmbientLuxChange(ambientLux),
		() -> mHbmController.onAmbientLuxChange(ambientLux)
		);
		}

		float getNormalBrightnessMax() {
		return mHbmController.getNormalBrightnessMax();
		}

		void loadFromConfig(HighBrightnessModeMetadata hbmMetadata, IBinder token,
		DisplayDeviceInfo info, DisplayDeviceConfig displayDeviceConfig) {
		applyChanges(
		() -> mNormalBrightnessModeController.resetNbmData(
		displayDeviceConfig.getLuxThrottlingData()),
		() -> {
		mHbmController.setHighBrightnessModeMetadata(hbmMetadata);
		mHbmController.resetHbmData(info.width, info.height, token, info.uniqueId,
		displayDeviceConfig.getHighBrightnessModeData(),
		displayDeviceConfig::getHdrBrightnessFromSdr);
		}
		);
		}

		void stop() {
		mHbmController.stop();
		}

		void setAutoBrightnessEnabled(int state) {
		applyChanges(
		() -> mNormalBrightnessModeController.setAutoBrightnessState(state),
		() -> mHbmController.setAutoBrightnessEnabled(state)
		);
		}

		void onBrightnessChanged(float brightness, float unthrottledBrightness,
		@BrightnessInfo.BrightnessMaxReason int throttlingReason) {
		mHbmController.onBrightnessChanged(brightness, unthrottledBrightness, throttlingReason);
		}

		float getCurrentBrightnessMin() {
		return mHbmController.getCurrentBrightnessMin();
		}


		float getCurrentBrightnessMax() {
		if (NBM_FEATURE_FLAG && mHbmController.getHighBrightnessMode()
		== BrightnessInfo.HIGH_BRIGHTNESS_MODE_OFF) {
		return Math.min(mHbmController.getCurrentBrightnessMax(),
		mNormalBrightnessModeController.getCurrentBrightnessMax());
		}
		return mHbmController.getCurrentBrightnessMax();
		}

		int getHighBrightnessMode() {
		return mHbmController.getHighBrightnessMode();
		}

		float getHdrBrightnessValue() {
		return mHbmController.getHdrBrightnessValue();
		}

		float getTransitionPoint() {
		return mHbmController.getTransitionPoint();
		}

		private void applyChanges(BooleanSupplier nbmChangesFunc, Runnable hbmChangesFunc) {
		if (NBM_FEATURE_FLAG) {
		boolean nbmTransitionChanged = nbmChangesFunc.getAsBoolean();
		hbmChangesFunc.run();
		// if nbm transition changed - trigger callback
		// HighBrightnessModeController handles sending changes itself
		if (nbmTransitionChanged) {
		mModeChangeCallback.run();
		}
		} else {
		hbmChangesFunc.run();
		}
		}
		}

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

+93 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.display.BrightnessSynchronizer;
		import com.android.server.display.config.AutoBrightness;
		import com.android.server.display.config.BlockingZoneConfig;
		import com.android.server.display.config.BrightnessLimitMap;
		import com.android.server.display.config.BrightnessThresholds;
		import com.android.server.display.config.BrightnessThrottlingMap;
		import com.android.server.display.config.BrightnessThrottlingPoint;
		@@ -51,8 +52,11 @@ import com.android.server.display.config.DisplayQuirks;
		import com.android.server.display.config.HbmTiming;
		import com.android.server.display.config.HighBrightnessMode;
		import com.android.server.display.config.IntegerArray;
		import com.android.server.display.config.LuxThrottling;
		import com.android.server.display.config.NitsMap;
		import com.android.server.display.config.NonNegativeFloatToFloatPoint;
		import com.android.server.display.config.Point;
		import com.android.server.display.config.PredefinedBrightnessLimitNames;
		import com.android.server.display.config.RefreshRateConfigs;
		import com.android.server.display.config.RefreshRateRange;
		import com.android.server.display.config.RefreshRateThrottlingMap;
		@@ -219,6 +223,22 @@ import javax.xml.datatype.DatatypeConfigurationException;
		* <allowInLowPowerMode>false</allowInLowPowerMode>
		* </highBrightnessMode>
		*
		* <luxThrottling>
		* <brightnessLimitMap>
		* <type>default</type>
		* <map>
		* <point>
		* <first>5000</first>
		* <second>0.3</second>
		* </point>
		* <point>
		* <first>5000</first>
		* <second>0.3</second>
		* </point>
		* </map>
		* </brightnessPeakMap>
		* </luxThrottling>
		*
		* <quirks>
		* <quirk>canSetBrightnessViaHwc</quirk>
		* </quirks>
		@@ -693,6 +713,9 @@ public class DisplayDeviceConfig {
		private final Map<String, SparseArray<SurfaceControl.RefreshRateRange>>
		mRefreshRateThrottlingMap = new HashMap<>();

		private final Map<BrightnessLimitMapType, Map<Float, Float>>
		mLuxThrottlingData = new HashMap<>();

		@Nullable
		private HostUsiVersion mHostUsiVersion;

		@@ -1344,6 +1367,11 @@ public class DisplayDeviceConfig {
		return hbmData;
		}

		@NonNull
		public Map<BrightnessLimitMapType, Map<Float, Float>> getLuxThrottlingData() {
		return mLuxThrottlingData;
		}

		public List<RefreshRateLimitation> getRefreshRateLimitations() {
		return mRefreshRateLimitations;
		}
		@@ -1530,6 +1558,7 @@ public class DisplayDeviceConfig {
		+ ", mBrightnessDefault=" + mBrightnessDefault
		+ ", mQuirks=" + mQuirks
		+ ", isHbmEnabled=" + mIsHighBrightnessModeEnabled
		+ ", mLuxThrottlingData=" + mLuxThrottlingData
		+ ", mHbmData=" + mHbmData
		+ ", mSdrToHdrRatioSpline=" + mSdrToHdrRatioSpline
		+ ", mThermalBrightnessThrottlingDataMapByThrottlingId="
		@@ -1676,6 +1705,7 @@ public class DisplayDeviceConfig {
		loadBrightnessMap(config);
		loadThermalThrottlingConfig(config);
		loadHighBrightnessModeData(config);
		loadLuxThrottling(config);
		loadQuirks(config);
		loadBrightnessRamps(config);
		loadAmbientLightSensorFromDdc(config);
		@@ -2428,6 +2458,54 @@ public class DisplayDeviceConfig {
		}
		}

		private void loadLuxThrottling(DisplayConfiguration config) {
		LuxThrottling cfg = config.getLuxThrottling();
		if (cfg != null) {
		HighBrightnessMode hbm = config.getHighBrightnessMode();
		float hbmTransitionPoint = hbm != null ? hbm.getTransitionPoint_all().floatValue()
		: PowerManager.BRIGHTNESS_MAX;
		List<BrightnessLimitMap> limitMaps = cfg.getBrightnessLimitMap();
		for (BrightnessLimitMap map : limitMaps) {
		PredefinedBrightnessLimitNames type = map.getType();
		BrightnessLimitMapType mappedType = BrightnessLimitMapType.convert(type);
		if (mappedType == null) {
		Slog.wtf(TAG, "Invalid NBM config: unsupported map type=" + type);
		continue;
		}
		if (mLuxThrottlingData.containsKey(mappedType)) {
		Slog.wtf(TAG, "Invalid NBM config: duplicate map type=" + mappedType);
		continue;
		}
		Map<Float, Float> luxToTransitionPointMap = new HashMap<>();

		List<NonNegativeFloatToFloatPoint> points = map.getMap().getPoint();
		for (NonNegativeFloatToFloatPoint point : points) {
		float lux = point.getFirst().floatValue();
		float maxBrightness = point.getSecond().floatValue();
		if (maxBrightness > hbmTransitionPoint) {
		Slog.wtf(TAG,
		"Invalid NBM config: maxBrightness is greater than hbm"
		+ ".transitionPoint. type="
		+ type + "; lux=" + lux + "; maxBrightness="
		+ maxBrightness);
		continue;
		}
		if (luxToTransitionPointMap.containsKey(lux)) {
		Slog.wtf(TAG,
		"Invalid NBM config: duplicate lux key. type=" + type + "; lux="
		+ lux);
		continue;
		}
		luxToTransitionPointMap.put(lux,
		mBacklightToBrightnessSpline.interpolate(maxBrightness));
		}
		if (!luxToTransitionPointMap.isEmpty()) {
		mLuxThrottlingData.put(mappedType, luxToTransitionPointMap);
		}
		}
		}
		}

		private void loadBrightnessRamps(DisplayConfiguration config) {
		// Priority 1: Value in the display device config (float)
		// Priority 2: Value in the config.xml (int)
		@@ -3155,4 +3233,19 @@ public class DisplayDeviceConfig {
		}
		}
		}

		public enum BrightnessLimitMapType {
		DEFAULT, ADAPTIVE;

		@Nullable
		private static BrightnessLimitMapType convert(PredefinedBrightnessLimitNames type) {
		switch (type) {
		case _default:
		return DEFAULT;
		case adaptive:
		return ADAPTIVE;
		}
		return null;
		}
		}
		}

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

+45 −45

File changed.

Preview size limit exceeded, changes collapsed.

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

+50 −54

File changed.

Preview size limit exceeded, changes collapsed.