Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b5067b2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Explicitly specify thermal throttling type" into udc-dev am: 7220f21d am: 194c946c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22112226



Change-Id: I7dd80d7129a95e467c308b7dd3ab8b7edde0118f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 28819a4c 194c946c

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

+62 −57
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ import android.provider.DeviceConfigInterface; 
import android.util.Slog;



import com.android.internal.annotations.VisibleForTesting;

import com.android.server.display.DisplayDeviceConfig.BrightnessThrottlingData;

import com.android.server.display.DisplayDeviceConfig.BrightnessThrottlingData.ThrottlingLevel;

import com.android.server.display.DisplayDeviceConfig.ThermalBrightnessThrottlingData;

import com.android.server.display.DisplayDeviceConfig.ThermalBrightnessThrottlingData.ThrottlingLevel;



import java.io.PrintWriter;

import java.util.ArrayList;
@@ -69,12 +69,12 @@ class BrightnessThrottler { 


    // Maps the throttling ID to the data. Sourced from DisplayDeviceConfig.

    @NonNull

    private HashMap<String, BrightnessThrottlingData> mDdcThrottlingDataMap;

    private HashMap<String, ThermalBrightnessThrottlingData> mDdcThermalThrottlingDataMap;



    // Current throttling data being used.

    // Null if we do not support throttling.

    @Nullable

    private BrightnessThrottlingData mThrottlingData;

    private ThermalBrightnessThrottlingData mThermalThrottlingData;



    private float mBrightnessCap = PowerManager.BRIGHTNESS_MAX;

    private @BrightnessInfo.BrightnessMaxReason int mBrightnessMaxReason =
@@ -82,51 +82,53 @@ class BrightnessThrottler { 
    private String mUniqueDisplayId;



    // The most recent string that has been set from DeviceConfig

    private String mBrightnessThrottlingDataString;

    private String mThermalBrightnessThrottlingDataString;



    // The brightness throttling configuration that should be used.

    private String mBrightnessThrottlingDataId;

    private String mThermalBrightnessThrottlingDataId;



    // This is a collection of brightness throttling data that has been written as overrides from

    // the DeviceConfig. This will always take priority over the display device config data.

    // We need to store the data for every display device, so we do not need to update this each

    // time the underlying display device changes.

    // This map is indexed by uniqueDisplayId, to provide maps for throttlingId -> throttlingData.

    // HashMap< uniqueDisplayId, HashMap< throttlingDataId, BrightnessThrottlingData >>

    private final HashMap<String, HashMap<String, BrightnessThrottlingData>>

            mBrightnessThrottlingDataOverride = new HashMap<>(1);

    // HashMap< uniqueDisplayId, HashMap< throttlingDataId, ThermalBrightnessThrottlingData >>

    private final HashMap<String, HashMap<String, ThermalBrightnessThrottlingData>>

            mThermalBrightnessThrottlingDataOverride = new HashMap<>(1);



    BrightnessThrottler(Handler handler, Runnable throttlingChangeCallback, String uniqueDisplayId,

            String throttlingDataId,

            @NonNull HashMap<String, BrightnessThrottlingData> brightnessThrottlingDataMap) {

            @NonNull HashMap<String, ThermalBrightnessThrottlingData>

                    thermalBrightnessThrottlingDataMap) {

        this(new Injector(), handler, handler, throttlingChangeCallback,

                uniqueDisplayId, throttlingDataId, brightnessThrottlingDataMap);

                uniqueDisplayId, throttlingDataId, thermalBrightnessThrottlingDataMap);

    }



    @VisibleForTesting

    BrightnessThrottler(Injector injector, Handler handler, Handler deviceConfigHandler,

            Runnable throttlingChangeCallback, String uniqueDisplayId, String throttlingDataId,

            @NonNull HashMap<String, BrightnessThrottlingData> brightnessThrottlingDataMap) {

            @NonNull HashMap<String, ThermalBrightnessThrottlingData>

                    thermalBrightnessThrottlingDataMap) {

        mInjector = injector;



        mHandler = handler;

        mDeviceConfigHandler = deviceConfigHandler;

        mDdcThrottlingDataMap = brightnessThrottlingDataMap;

        mDdcThermalThrottlingDataMap = thermalBrightnessThrottlingDataMap;

        mThrottlingChangeCallback = throttlingChangeCallback;

        mSkinThermalStatusObserver = new SkinThermalStatusObserver(mInjector, mHandler);



        mUniqueDisplayId = uniqueDisplayId;

        mDeviceConfig = injector.getDeviceConfig();

        mDeviceConfigListener = new DeviceConfigListener();

        mBrightnessThrottlingDataId = throttlingDataId;

        mDdcThrottlingDataMap = brightnessThrottlingDataMap;

        loadBrightnessThrottlingDataFromDeviceConfig();

        loadBrightnessThrottlingDataFromDisplayDeviceConfig(mDdcThrottlingDataMap,

                mBrightnessThrottlingDataId, mUniqueDisplayId);

        mThermalBrightnessThrottlingDataId = throttlingDataId;

        mDdcThermalThrottlingDataMap = thermalBrightnessThrottlingDataMap;

        loadThermalBrightnessThrottlingDataFromDeviceConfig();

        loadThermalBrightnessThrottlingDataFromDisplayDeviceConfig(mDdcThermalThrottlingDataMap,

                mThermalBrightnessThrottlingDataId, mUniqueDisplayId);

    }



    boolean deviceSupportsThrottling() {

        return mThrottlingData != null;

        return mThermalThrottlingData != null;

    }



    float getBrightnessCap() {
@@ -154,14 +156,14 @@ class BrightnessThrottler { 
        mThrottlingStatus = THROTTLING_INVALID;

    }



    void loadBrightnessThrottlingDataFromDisplayDeviceConfig(

            HashMap<String, BrightnessThrottlingData> ddcThrottlingDataMap,

    void loadThermalBrightnessThrottlingDataFromDisplayDeviceConfig(

            HashMap<String, ThermalBrightnessThrottlingData> ddcThrottlingDataMap,

            String brightnessThrottlingDataId,

            String uniqueDisplayId) {

        mDdcThrottlingDataMap = ddcThrottlingDataMap;

        mBrightnessThrottlingDataId = brightnessThrottlingDataId;

        mDdcThermalThrottlingDataMap = ddcThrottlingDataMap;

        mThermalBrightnessThrottlingDataId = brightnessThrottlingDataId;

        mUniqueDisplayId = uniqueDisplayId;

        resetThrottlingData();

        resetThermalThrottlingData();

    }



    private float verifyAndConstrainBrightnessCap(float brightness) {
@@ -183,11 +185,11 @@ class BrightnessThrottler { 
    private void thermalStatusChanged(@Temperature.ThrottlingStatus int newStatus) {

        if (mThrottlingStatus != newStatus) {

            mThrottlingStatus = newStatus;

            updateThrottling();

            updateThermalThrottling();

        }

    }



    private void updateThrottling() {

    private void updateThermalThrottling() {

        if (!deviceSupportsThrottling()) {

            return;

        }
@@ -195,9 +197,9 @@ class BrightnessThrottler { 
        float brightnessCap = PowerManager.BRIGHTNESS_MAX;

        int brightnessMaxReason = BrightnessInfo.BRIGHTNESS_MAX_REASON_NONE;



        if (mThrottlingStatus != THROTTLING_INVALID && mThrottlingData != null) {

        if (mThrottlingStatus != THROTTLING_INVALID && mThermalThrottlingData != null) {

            // Throttling levels are sorted by increasing severity

            for (ThrottlingLevel level : mThrottlingData.throttlingLevels) {

            for (ThrottlingLevel level : mThermalThrottlingData.throttlingLevels) {

                if (level.thermalStatus <= mThrottlingStatus) {

                    brightnessCap = level.brightness;

                    brightnessMaxReason = BrightnessInfo.BRIGHTNESS_MAX_REASON_THERMAL;
@@ -230,21 +232,23 @@ class BrightnessThrottler { 


    private void dumpLocal(PrintWriter pw) {

        pw.println("BrightnessThrottler:");

        pw.println("  mBrightnessThrottlingDataId=" + mBrightnessThrottlingDataId);

        pw.println("  mThrottlingData=" + mThrottlingData);

        pw.println("  mThermalBrightnessThrottlingDataId=" + mThermalBrightnessThrottlingDataId);

        pw.println("  mThermalThrottlingData=" + mThermalThrottlingData);

        pw.println("  mUniqueDisplayId=" + mUniqueDisplayId);

        pw.println("  mThrottlingStatus=" + mThrottlingStatus);

        pw.println("  mBrightnessCap=" + mBrightnessCap);

        pw.println("  mBrightnessMaxReason=" +

            BrightnessInfo.briMaxReasonToString(mBrightnessMaxReason));

        pw.println("  mDdcThrottlingDataMap=" + mDdcThrottlingDataMap);

        pw.println("  mBrightnessThrottlingDataOverride=" + mBrightnessThrottlingDataOverride);

        pw.println("  mBrightnessThrottlingDataString=" + mBrightnessThrottlingDataString);

        pw.println("  mDdcThermalThrottlingDataMap=" + mDdcThermalThrottlingDataMap);

        pw.println("  mThermalBrightnessThrottlingDataOverride="

                + mThermalBrightnessThrottlingDataOverride);

        pw.println("  mThermalBrightnessThrottlingDataString="

                + mThermalBrightnessThrottlingDataString);



        mSkinThermalStatusObserver.dump(pw);

    }



    private String getBrightnessThrottlingDataString() {

    private String getThermalBrightnessThrottlingDataString() {

        return mDeviceConfig.getString(DeviceConfig.NAMESPACE_DISPLAY_MANAGER,

                DisplayManager.DeviceConfig.KEY_BRIGHTNESS_THROTTLING_DATA,

                /* defaultValue= */ null);
@@ -260,7 +264,7 @@ class BrightnessThrottler { 
    // displayId, number, <state, val> * number

    // displayId, <number, <state, val> * number>, throttlingId

    private boolean parseAndAddData(@NonNull String strArray,

            @NonNull HashMap<String, HashMap<String, BrightnessThrottlingData>>

            @NonNull HashMap<String, HashMap<String, ThermalBrightnessThrottlingData>>

                    displayIdToThrottlingIdToBtd) {

        boolean validConfig = true;

        String[] items = strArray.split(",");
@@ -282,11 +286,11 @@ class BrightnessThrottler { 
            }



            String throttlingDataId = (i < items.length) ? items[i++] : DEFAULT_ID;

            BrightnessThrottlingData throttlingLevelsData =

                    DisplayDeviceConfig.BrightnessThrottlingData.create(throttlingLevels);

            ThermalBrightnessThrottlingData throttlingLevelsData =

                    DisplayDeviceConfig.ThermalBrightnessThrottlingData.create(throttlingLevels);



            // Add throttlingLevelsData to inner map where necessary.

            HashMap<String, BrightnessThrottlingData> throttlingMapForDisplay =

            HashMap<String, ThermalBrightnessThrottlingData> throttlingMapForDisplay =

                    displayIdToThrottlingIdToBtd.get(uniqueDisplayId);

            if (throttlingMapForDisplay == null) {

                throttlingMapForDisplay = new HashMap<>();
@@ -311,14 +315,14 @@ class BrightnessThrottler { 
        return validConfig;

    }



    private void loadBrightnessThrottlingDataFromDeviceConfig() {

        HashMap<String, HashMap<String, BrightnessThrottlingData>> tempThrottlingData =

    private void loadThermalBrightnessThrottlingDataFromDeviceConfig() {

        HashMap<String, HashMap<String, ThermalBrightnessThrottlingData>> tempThrottlingData =

                new HashMap<>(1);

        mBrightnessThrottlingDataString = getBrightnessThrottlingDataString();

        mThermalBrightnessThrottlingDataString = getThermalBrightnessThrottlingDataString();

        boolean validConfig = true;

        mBrightnessThrottlingDataOverride.clear();

        if (mBrightnessThrottlingDataString != null) {

            String[] throttlingDataSplits = mBrightnessThrottlingDataString.split(";");

        mThermalBrightnessThrottlingDataOverride.clear();

        if (mThermalBrightnessThrottlingDataString != null) {

            String[] throttlingDataSplits = mThermalBrightnessThrottlingDataString.split(";");

            for (String s : throttlingDataSplits) {

                if (!parseAndAddData(s, tempThrottlingData)) {

                    validConfig = false;
@@ -327,26 +331,27 @@ class BrightnessThrottler { 
            }



            if (validConfig) {

                mBrightnessThrottlingDataOverride.putAll(tempThrottlingData);

                mThermalBrightnessThrottlingDataOverride.putAll(tempThrottlingData);

                tempThrottlingData.clear();

            }



        } else {

            Slog.w(TAG, "DeviceConfig BrightnessThrottlingData is null");

            Slog.w(TAG, "DeviceConfig ThermalBrightnessThrottlingData is null");

        }

    }



    private void resetThrottlingData() {

    private void resetThermalThrottlingData() {

        stop();



        mDeviceConfigListener.startListening();



        // Get throttling data for this id, if it exists

        mThrottlingData = getConfigFromId(mBrightnessThrottlingDataId);

        mThermalThrottlingData = getConfigFromId(mThermalBrightnessThrottlingDataId);



        // Fallback to default id otherwise.

        if (!DEFAULT_ID.equals(mBrightnessThrottlingDataId) && mThrottlingData == null) {

            mThrottlingData = getConfigFromId(DEFAULT_ID);

        if (!DEFAULT_ID.equals(mThermalBrightnessThrottlingDataId)

                && mThermalThrottlingData == null) {

            mThermalThrottlingData = getConfigFromId(DEFAULT_ID);

            Slog.d(TAG, "Falling back to default throttling Id");

        }
@@ -355,17 +360,17 @@ class BrightnessThrottler { 
        }

    }



    private BrightnessThrottlingData getConfigFromId(String id) {

        BrightnessThrottlingData returnValue;

    private ThermalBrightnessThrottlingData getConfigFromId(String id) {

        ThermalBrightnessThrottlingData returnValue;



        // Fallback pattern for fetching correct throttling data for this display and id.

        // 1) throttling data from device config for this throttling data id

        returnValue =  mBrightnessThrottlingDataOverride.get(mUniqueDisplayId) == null

        returnValue =  mThermalBrightnessThrottlingDataOverride.get(mUniqueDisplayId) == null

                ? null

                : mBrightnessThrottlingDataOverride.get(mUniqueDisplayId).get(id);

                : mThermalBrightnessThrottlingDataOverride.get(mUniqueDisplayId).get(id);

        // 2) throttling data from ddc for this throttling data id

        returnValue = returnValue == null

                ? mDdcThrottlingDataMap.get(id)

                ? mDdcThermalThrottlingDataMap.get(id)

                : returnValue;



        return returnValue;
@@ -391,8 +396,8 @@ class BrightnessThrottler { 


        @Override

        public void onPropertiesChanged(DeviceConfig.Properties properties) {

            loadBrightnessThrottlingDataFromDeviceConfig();

            resetThrottlingData();

            loadThermalBrightnessThrottlingDataFromDeviceConfig();

            resetThermalThrottlingData();

        }

    }

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

+26 −25
Original line number Diff line number Diff line
@@ -687,8 +687,8 @@ public class DisplayDeviceConfig { 
    private int[] mHighDisplayBrightnessThresholds = DEFAULT_BRIGHTNESS_THRESHOLDS;

    private int[] mHighAmbientBrightnessThresholds = DEFAULT_BRIGHTNESS_THRESHOLDS;



    private final HashMap<String, BrightnessThrottlingData>

            mBrightnessThrottlingDataMapByThrottlingId = new HashMap<>();

    private final HashMap<String, ThermalBrightnessThrottlingData>

            mThermalBrightnessThrottlingDataMapByThrottlingId = new HashMap<>();



    private final Map<String, SparseArray<SurfaceControl.RefreshRateRange>>

            mRefreshRateThrottlingMap = new HashMap<>();
@@ -1348,9 +1348,9 @@ public class DisplayDeviceConfig { 
    /**

     * @return brightness throttling configuration data for this display, for each throttling id.

     */

    public HashMap<String, BrightnessThrottlingData>

            getBrightnessThrottlingDataMapByThrottlingId() {

        return mBrightnessThrottlingDataMapByThrottlingId;

    public HashMap<String, ThermalBrightnessThrottlingData>

            getThermalBrightnessThrottlingDataMapByThrottlingId() {

        return mThermalBrightnessThrottlingDataMapByThrottlingId;

    }



    /**
@@ -1358,7 +1358,7 @@ public class DisplayDeviceConfig { 
     * @return refresh rate throttling configuration

     */

    @Nullable

    public SparseArray<SurfaceControl.RefreshRateRange> getRefreshRateThrottlingData(

    public SparseArray<SurfaceControl.RefreshRateRange> getThermalRefreshRateThrottlingData(

            @Nullable String id) {

        String key = id == null ? DEFAULT_ID : id;

        return mRefreshRateThrottlingMap.get(key);
@@ -1525,8 +1525,8 @@ public class DisplayDeviceConfig { 
                + ", isHbmEnabled=" + mIsHighBrightnessModeEnabled

                + ", mHbmData=" + mHbmData

                + ", mSdrToHdrRatioSpline=" + mSdrToHdrRatioSpline

                + ", mBrightnessThrottlingDataMapByThrottlingId="

                + mBrightnessThrottlingDataMapByThrottlingId

                + ", mThermalBrightnessThrottlingDataMapByThrottlingId="

                + mThermalBrightnessThrottlingDataMapByThrottlingId

                + "\n"

                + ", mBrightnessRampFastDecrease=" + mBrightnessRampFastDecrease

                + ", mBrightnessRampFastIncrease=" + mBrightnessRampFastIncrease
@@ -1887,11 +1887,11 @@ public class DisplayDeviceConfig { 
            Slog.i(TAG, "No thermal throttling config found");

            return;

        }

        loadBrightnessThrottlingMaps(throttlingConfig);

        loadRefreshRateThermalThrottlingMap(throttlingConfig);

        loadThermalBrightnessThrottlingMaps(throttlingConfig);

        loadThermalRefreshRateThrottlingMap(throttlingConfig);

    }



    private void loadBrightnessThrottlingMaps(ThermalThrottling throttlingConfig) {

    private void loadThermalBrightnessThrottlingMaps(ThermalThrottling throttlingConfig) {

        final List<BrightnessThrottlingMap> maps = throttlingConfig.getBrightnessThrottlingMap();

        if (maps == null || maps.isEmpty()) {

            Slog.i(TAG, "No brightness throttling map found");
@@ -1901,7 +1901,7 @@ public class DisplayDeviceConfig { 
        for (BrightnessThrottlingMap map : maps) {

            final List<BrightnessThrottlingPoint> points = map.getBrightnessThrottlingPoint();

            // At least 1 point is guaranteed by the display device config schema

            List<BrightnessThrottlingData.ThrottlingLevel> throttlingLevels =

            List<ThermalBrightnessThrottlingData.ThrottlingLevel> throttlingLevels =

                    new ArrayList<>(points.size());



            boolean badConfig = false;
@@ -1912,24 +1912,24 @@ public class DisplayDeviceConfig { 
                    break;

                }



                throttlingLevels.add(new BrightnessThrottlingData.ThrottlingLevel(

                throttlingLevels.add(new ThermalBrightnessThrottlingData.ThrottlingLevel(

                        convertThermalStatus(status), point.getBrightness().floatValue()));

            }



            if (!badConfig) {

                String id = map.getId() == null ? DEFAULT_ID

                        : map.getId();

                if (mBrightnessThrottlingDataMapByThrottlingId.containsKey(id)) {

                if (mThermalBrightnessThrottlingDataMapByThrottlingId.containsKey(id)) {

                    throw new RuntimeException("Brightness throttling data with ID " + id

                            + " already exists");

                }

                mBrightnessThrottlingDataMapByThrottlingId.put(id,

                        BrightnessThrottlingData.create(throttlingLevels));

                mThermalBrightnessThrottlingDataMapByThrottlingId.put(id,

                        ThermalBrightnessThrottlingData.create(throttlingLevels));

            }

        }

    }



    private void loadRefreshRateThermalThrottlingMap(ThermalThrottling throttlingConfig) {

    private void loadThermalRefreshRateThrottlingMap(ThermalThrottling throttlingConfig) {

        List<RefreshRateThrottlingMap> maps = throttlingConfig.getRefreshRateThrottlingMap();

        if (maps == null || maps.isEmpty()) {

            Slog.w(TAG, "RefreshRateThrottling: map not found");
@@ -3039,7 +3039,7 @@ public class DisplayDeviceConfig { 
    /**

     * Container for brightness throttling data.

     */

    public static class BrightnessThrottlingData {

    public static class ThermalBrightnessThrottlingData {

        public List<ThrottlingLevel> throttlingLevels;



        static class ThrottlingLevel {
@@ -3080,7 +3080,8 @@ public class DisplayDeviceConfig { 
        /**

         * Creates multiple temperature based throttling levels of brightness

         */

        public static BrightnessThrottlingData create(List<ThrottlingLevel> throttlingLevels) {

        public static ThermalBrightnessThrottlingData create(

                List<ThrottlingLevel> throttlingLevels) {

            if (throttlingLevels == null || throttlingLevels.size() == 0) {

                Slog.e(TAG, "BrightnessThrottlingData received null or empty throttling levels");

                return null;
@@ -3118,12 +3119,12 @@ public class DisplayDeviceConfig { 
                }

            }



            return new BrightnessThrottlingData(throttlingLevels);

            return new ThermalBrightnessThrottlingData(throttlingLevels);

        }



        @Override

        public String toString() {

            return "BrightnessThrottlingData{"

            return "ThermalBrightnessThrottlingData{"

                    + "throttlingLevels:" + throttlingLevels

                    + "} ";

        }
@@ -3134,12 +3135,12 @@ public class DisplayDeviceConfig { 
                return true;

            }



            if (!(obj instanceof BrightnessThrottlingData)) {

            if (!(obj instanceof ThermalBrightnessThrottlingData)) {

                return false;

            }



            BrightnessThrottlingData otherBrightnessThrottlingData = (BrightnessThrottlingData) obj;

            return throttlingLevels.equals(otherBrightnessThrottlingData.throttlingLevels);

            ThermalBrightnessThrottlingData otherData = (ThermalBrightnessThrottlingData) obj;

            return throttlingLevels.equals(otherData.throttlingLevels);

        }



        @Override
@@ -3148,7 +3149,7 @@ public class DisplayDeviceConfig { 
        }



        @VisibleForTesting

        BrightnessThrottlingData(List<ThrottlingLevel> inLevels) {

        ThermalBrightnessThrottlingData(List<ThrottlingLevel> inLevels) {

            throttlingLevels = new ArrayList<>(inLevels.size());

            for (ThrottlingLevel level : inLevels) {

                throttlingLevels.add(new ThrottlingLevel(level.thermalStatus, level.brightness));

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

+18 −16

File changed.

Preview size limit exceeded, changes collapsed.

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

+18 −16
Original line number Diff line number Diff line
@@ -400,8 +400,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
    private boolean mIsEnabled;

    private boolean mIsInTransition;



    // The id of the brightness throttling policy that should be used.

    private String mBrightnessThrottlingDataId;

    // The id of the thermal brightness throttling policy that should be used.

    private String mThermalBrightnessThrottlingDataId;



    // DPCs following the brightness of this DPC. This is used in concurrent displays mode - there

    // is one lead display, the additional displays follow the brightness value of the lead display.
@@ -439,7 +439,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        mDisplayStateController = new DisplayStateController(mDisplayPowerProximityStateController);

        mAutomaticBrightnessStrategy = new AutomaticBrightnessStrategy(context, mDisplayId);

        mTag = "DisplayPowerController2[" + mDisplayId + "]";

        mBrightnessThrottlingDataId = logicalDisplay.getBrightnessThrottlingDataIdLocked();

        mThermalBrightnessThrottlingDataId =

            logicalDisplay.getThermalBrightnessThrottlingDataIdLocked();



        mDisplayDevice = mLogicalDisplay.getPrimaryDisplayDeviceLocked();

        mUniqueDisplayId = logicalDisplay.getPrimaryDisplayDeviceLocked().getUniqueId();
@@ -707,8 +708,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        final DisplayDeviceInfo info = device.getDisplayDeviceInfoLocked();

        final boolean isEnabled = mLogicalDisplay.isEnabledLocked();

        final boolean isInTransition = mLogicalDisplay.isInTransitionLocked();

        final String brightnessThrottlingDataId =

                mLogicalDisplay.getBrightnessThrottlingDataIdLocked();

        final String thermalBrightnessThrottlingDataId =

                mLogicalDisplay.getThermalBrightnessThrottlingDataIdLocked();



        mHandler.postAtTime(() -> {

            boolean changed = false;
@@ -718,7 +719,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                mUniqueDisplayId = uniqueId;

                mDisplayStatsId = mUniqueDisplayId.hashCode();

                mDisplayDeviceConfig = config;

                mBrightnessThrottlingDataId = brightnessThrottlingDataId;

                mThermalBrightnessThrottlingDataId = thermalBrightnessThrottlingDataId;

                loadFromDisplayDeviceConfig(token, info, hbmMetadata);

                mDisplayPowerProximityStateController.notifyDisplayDeviceChanged(config);
@@ -726,12 +727,13 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                // last command that was sent to change it's state. Let's assume it is unknown so

                // that we trigger a change immediately.

                mPowerState.resetScreenState();

            } else if (!mBrightnessThrottlingDataId.equals(brightnessThrottlingDataId)) {

            } else if (

                    !mThermalBrightnessThrottlingDataId.equals(thermalBrightnessThrottlingDataId)) {

                changed = true;

                mBrightnessThrottlingDataId = brightnessThrottlingDataId;

                mBrightnessThrottler.loadBrightnessThrottlingDataFromDisplayDeviceConfig(

                        config.getBrightnessThrottlingDataMapByThrottlingId(),

                        mBrightnessThrottlingDataId,

                mThermalBrightnessThrottlingDataId = thermalBrightnessThrottlingDataId;

                mBrightnessThrottler.loadThermalBrightnessThrottlingDataFromDisplayDeviceConfig(

                        config.getThermalBrightnessThrottlingDataMapByThrottlingId(),

                        mThermalBrightnessThrottlingDataId,

                        mUniqueDisplayId);

            }

            if (mIsEnabled != isEnabled || mIsInTransition != isInTransition) {
@@ -797,9 +799,9 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                                sdrBrightness, maxDesiredHdrSdrRatio);

                    }

                });

        mBrightnessThrottler.loadBrightnessThrottlingDataFromDisplayDeviceConfig(

                mDisplayDeviceConfig.getBrightnessThrottlingDataMapByThrottlingId(),

                mBrightnessThrottlingDataId, mUniqueDisplayId);

        mBrightnessThrottler.loadThermalBrightnessThrottlingDataFromDisplayDeviceConfig(

                mDisplayDeviceConfig.getThermalBrightnessThrottlingDataMapByThrottlingId(),

                mThermalBrightnessThrottlingDataId, mUniqueDisplayId);

    }



    private void sendUpdatePowerState() {
@@ -1762,8 +1764,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                () -> {

                    sendUpdatePowerState();

                    postBrightnessChangeRunnable();

                }, mUniqueDisplayId, mLogicalDisplay.getBrightnessThrottlingDataIdLocked(),

                ddConfig.getBrightnessThrottlingDataMapByThrottlingId());

                }, mUniqueDisplayId, mLogicalDisplay.getThermalBrightnessThrottlingDataIdLocked(),

                ddConfig.getThermalBrightnessThrottlingDataMapByThrottlingId());

    }



    private void blockScreenOn() {

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

+11 −11

File changed.

Preview size limit exceeded, changes collapsed.