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

Commit 3219191b authored by Michael Wright's avatar Michael Wright Committed by Android (Google) Code Review
Browse files

Merge "Connect follower displays to lead display."

parents 1ab4daa6 52ca3aed

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

+34 −4
Original line number Original line Diff line number Diff line
@@ -142,6 +142,7 @@ import com.android.server.SystemService; 
import com.android.server.UiThread;

import com.android.server.UiThread;

import com.android.server.companion.virtual.VirtualDeviceManagerInternal;

import com.android.server.companion.virtual.VirtualDeviceManagerInternal;

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

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

import com.android.server.display.layout.Layout;

import com.android.server.display.utils.SensorUtils;

import com.android.server.display.utils.SensorUtils;

import com.android.server.input.InputManagerInternal;

import com.android.server.input.InputManagerInternal;

import com.android.server.wm.SurfaceAnimationThread;

import com.android.server.wm.SurfaceAnimationThread;
@@ -1665,12 +1666,37 @@ public final class DisplayManagerService extends SystemService { 
                return;

                return;

            }

            }





            // TODO (b/265793751): Set this DPC as a follower of the default DPC if needed,

            final int leadDisplayId = display.getLeadDisplayIdLocked();

            // clear this DPC's followers if it's not a lead display

            updateDisplayPowerControllerLeaderLocked(dpc, leadDisplayId);





            final String uniqueId = device.getUniqueId();

            final String uniqueId = device.getUniqueId();

            HighBrightnessModeMetadata hbmMetadata = mHighBrightnessModeMetadataMap.get(uniqueId);

            HighBrightnessModeMetadata hbmMetadata = mHighBrightnessModeMetadataMap.get(uniqueId);

            dpc.onDisplayChanged(hbmMetadata);

            dpc.onDisplayChanged(hbmMetadata, leadDisplayId);

        }

    }



    private void updateDisplayPowerControllerLeaderLocked(DisplayPowerControllerInterface dpc,

            int leadDisplayId) {

        if (dpc.getLeadDisplayId() == leadDisplayId) {

            // Lead display hasn't changed, nothing to do.

            return;

        }



        // If it has changed, then we need to unregister from the previous leader if there was one.

        final int prevLeaderId = dpc.getLeadDisplayId();

        if (prevLeaderId != Layout.NO_LEAD_DISPLAY) {

            final DisplayPowerControllerInterface prevLeader =

                    mDisplayPowerControllers.get(prevLeaderId);

            if (prevLeader != null) {

                prevLeader.removeDisplayBrightnessFollower(dpc);

            }

        }



        // And then, if it's following, register it with the new one.

        if (leadDisplayId != Layout.NO_LEAD_DISPLAY) {

            final DisplayPowerControllerInterface newLead =

                    mDisplayPowerControllers.get(leadDisplayId);

            newLead.addDisplayBrightnessFollower(dpc);

        }

        }

    }

    }
@@ -1734,9 +1760,13 @@ public final class DisplayManagerService extends SystemService { 
                        + display.getDisplayIdLocked());

                        + display.getDisplayIdLocked());

                return;

                return;

            }

            }



            final int leadDisplayId = display.getLeadDisplayIdLocked();

            updateDisplayPowerControllerLeaderLocked(dpc, leadDisplayId);



            final String uniqueId = device.getUniqueId();

            final String uniqueId = device.getUniqueId();

            HighBrightnessModeMetadata hbmMetadata = mHighBrightnessModeMetadataMap.get(uniqueId);

            HighBrightnessModeMetadata hbmMetadata = mHighBrightnessModeMetadataMap.get(uniqueId);

            dpc.onDisplayChanged(hbmMetadata);

            dpc.onDisplayChanged(hbmMetadata, leadDisplayId);

        }

        }

    }

    }

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

+22 −14
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.display; 




import android.animation.Animator;

import android.animation.Animator;

import android.animation.ObjectAnimator;

import android.animation.ObjectAnimator;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.UserIdInt;

import android.annotation.UserIdInt;

import android.app.ActivityManager;

import android.app.ActivityManager;
@@ -74,6 +75,7 @@ import com.android.server.display.brightness.BrightnessEvent; 
import com.android.server.display.brightness.BrightnessReason;

import com.android.server.display.brightness.BrightnessReason;

import com.android.server.display.color.ColorDisplayService.ColorDisplayServiceInternal;

import com.android.server.display.color.ColorDisplayService.ColorDisplayServiceInternal;

import com.android.server.display.color.ColorDisplayService.ReduceBrightColorsListener;

import com.android.server.display.color.ColorDisplayService.ReduceBrightColorsListener;

import com.android.server.display.layout.Layout;

import com.android.server.display.utils.SensorUtils;

import com.android.server.display.utils.SensorUtils;

import com.android.server.display.whitebalance.DisplayWhiteBalanceController;

import com.android.server.display.whitebalance.DisplayWhiteBalanceController;

import com.android.server.display.whitebalance.DisplayWhiteBalanceFactory;

import com.android.server.display.whitebalance.DisplayWhiteBalanceFactory;
@@ -195,6 +197,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
    // The ID of the LogicalDisplay tied to this DisplayPowerController.

    // The ID of the LogicalDisplay tied to this DisplayPowerController.

    private final int mDisplayId;

    private final int mDisplayId;





    // The ID of the display which this display follows for brightness purposes.

    private int mLeadDisplayId = Layout.NO_LEAD_DISPLAY;



    // The unique ID of the primary display device currently tied to this logical display

    // The unique ID of the primary display device currently tied to this logical display

    private String mUniqueDisplayId;

    private String mUniqueDisplayId;
@@ -509,8 +514,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
    // DPCs following the brightness of this DPC. This is used in concurrent displays mode - there

    // 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.

    // is one lead display, the additional displays follow the brightness value of the lead display.

    @GuardedBy("mLock")

    @GuardedBy("mLock")

    private SparseArray<DisplayPowerControllerInterface> mDisplayBrightnessFollowers =

    private final SparseArray<DisplayPowerControllerInterface> mDisplayBrightnessFollowers =

            new SparseArray();

            new SparseArray<>();





    /**

    /**

     * Creates the display power controller.

     * Creates the display power controller.
@@ -721,6 +726,11 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        return mDisplayId;

        return mDisplayId;

    }

    }





    @Override

    public int getLeadDisplayId() {

        return mLeadDisplayId;

    }



    @Override

    @Override

    public void setBrightnessToFollow(float leadDisplayBrightness, float nits, float ambientLux) {

    public void setBrightnessToFollow(float leadDisplayBrightness, float nits, float ambientLux) {

        mHbmController.onAmbientLuxChange(ambientLux);

        mHbmController.onAmbientLuxChange(ambientLux);
@@ -739,24 +749,20 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
    }

    }





    @Override

    @Override

    public void addDisplayBrightnessFollower(DisplayPowerControllerInterface follower) {

    public void addDisplayBrightnessFollower(@NonNull DisplayPowerControllerInterface follower) {

        synchronized (mLock) {

        synchronized (mLock) {

            mDisplayBrightnessFollowers.append(follower.getDisplayId(), follower);

            mDisplayBrightnessFollowers.append(follower.getDisplayId(), follower);

            sendUpdatePowerStateLocked();

        }

        }

        sendUpdatePowerState();

    }

    }





    @Override

    @Override

    public void clearDisplayBrightnessFollowers() {

    public void removeDisplayBrightnessFollower(@NonNull DisplayPowerControllerInterface follower) {

        SparseArray<DisplayPowerControllerInterface> followers;

        synchronized (mLock) {

        synchronized (mLock) {

            followers = mDisplayBrightnessFollowers.clone();

            mDisplayBrightnessFollowers.remove(follower.getDisplayId());

            mDisplayBrightnessFollowers.clear();

            mHandler.postAtTime(() -> follower.setBrightnessToFollow(

        }

                    PowerManager.BRIGHTNESS_INVALID_FLOAT, /* nits= */ -1,

        for (int i = 0; i < followers.size(); i++) {

                    /* ambientLux= */ 0), mClock.uptimeMillis());

            DisplayPowerControllerInterface follower = followers.valueAt(i);

            follower.setBrightnessToFollow(PowerManager.BRIGHTNESS_INVALID_FLOAT, /* nits= */ -1,

                    /* ambientLux= */ 0);

        }

        }

    }

    }
@@ -851,7 +857,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
     * Make sure DisplayManagerService.mSyncRoot is held when this is called

     * Make sure DisplayManagerService.mSyncRoot is held when this is called

     */

     */

    @Override

    @Override

    public void onDisplayChanged(HighBrightnessModeMetadata hbmMetadata) {

    public void onDisplayChanged(HighBrightnessModeMetadata hbmMetadata, int leadDisplayId) {

        mLeadDisplayId = leadDisplayId;

        final DisplayDevice device = mLogicalDisplay.getPrimaryDisplayDeviceLocked();

        final DisplayDevice device = mLogicalDisplay.getPrimaryDisplayDeviceLocked();

        if (device == null) {

        if (device == null) {

            Slog.wtf(mTag, "Display Device is null in DisplayPowerController for display: "

            Slog.wtf(mTag, "Display Device is null in DisplayPowerController for display: "
@@ -2701,6 +2708,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
            pw.println();

            pw.println();

            pw.println("Display Power Controller:");

            pw.println("Display Power Controller:");

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

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

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

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

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





            pw.println();

            pw.println();

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

+18 −11
Original line number Original line Diff line number Diff line
@@ -73,6 +73,7 @@ import com.android.server.display.brightness.BrightnessUtils; 
import com.android.server.display.brightness.DisplayBrightnessController;

import com.android.server.display.brightness.DisplayBrightnessController;

import com.android.server.display.color.ColorDisplayService.ColorDisplayServiceInternal;

import com.android.server.display.color.ColorDisplayService.ColorDisplayServiceInternal;

import com.android.server.display.color.ColorDisplayService.ReduceBrightColorsListener;

import com.android.server.display.color.ColorDisplayService.ReduceBrightColorsListener;

import com.android.server.display.layout.Layout;

import com.android.server.display.state.DisplayStateController;

import com.android.server.display.state.DisplayStateController;

import com.android.server.display.utils.SensorUtils;

import com.android.server.display.utils.SensorUtils;

import com.android.server.display.whitebalance.DisplayWhiteBalanceController;

import com.android.server.display.whitebalance.DisplayWhiteBalanceController;
@@ -179,6 +180,9 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
    // The ID of the LogicalDisplay tied to this DisplayPowerController2.

    // The ID of the LogicalDisplay tied to this DisplayPowerController2.

    private final int mDisplayId;

    private final int mDisplayId;





    // The ID of the display which this display follows for brightness purposes.

    private int mLeadDisplayId = Layout.NO_LEAD_DISPLAY;



    // The unique ID of the primary display device currently tied to this logical display

    // The unique ID of the primary display device currently tied to this logical display

    private String mUniqueDisplayId;

    private String mUniqueDisplayId;
@@ -694,7 +698,8 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
     * Make sure DisplayManagerService.mSyncRoot lock is held when this is called

     * Make sure DisplayManagerService.mSyncRoot lock is held when this is called

     */

     */

    @Override

    @Override

    public void onDisplayChanged(HighBrightnessModeMetadata hbmMetadata) {

    public void onDisplayChanged(HighBrightnessModeMetadata hbmMetadata, int leadDisplayId) {

        mLeadDisplayId = leadDisplayId;

        final DisplayDevice device = mLogicalDisplay.getPrimaryDisplayDeviceLocked();

        final DisplayDevice device = mLogicalDisplay.getPrimaryDisplayDeviceLocked();

        if (device == null) {

        if (device == null) {

            Slog.wtf(mTag, "Display Device is null in DisplayPowerController2 for display: "

            Slog.wtf(mTag, "Display Device is null in DisplayPowerController2 for display: "
@@ -2148,6 +2153,11 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        return mDisplayId;

        return mDisplayId;

    }

    }





    @Override

    public int getLeadDisplayId() {

        return mLeadDisplayId;

    }



    @Override

    @Override

    public void setBrightnessToFollow(float leadDisplayBrightness, float nits, float ambientLux) {

    public void setBrightnessToFollow(float leadDisplayBrightness, float nits, float ambientLux) {

        mHbmController.onAmbientLuxChange(ambientLux);

        mHbmController.onAmbientLuxChange(ambientLux);
@@ -2218,21 +2228,17 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
    public void addDisplayBrightnessFollower(DisplayPowerControllerInterface follower) {

    public void addDisplayBrightnessFollower(DisplayPowerControllerInterface follower) {

        synchronized (mLock) {

        synchronized (mLock) {

            mDisplayBrightnessFollowers.append(follower.getDisplayId(), follower);

            mDisplayBrightnessFollowers.append(follower.getDisplayId(), follower);

            sendUpdatePowerStateLocked();

        }

        }

        sendUpdatePowerState();

    }

    }





    @Override

    @Override

    public void clearDisplayBrightnessFollowers() {

    public void removeDisplayBrightnessFollower(DisplayPowerControllerInterface follower) {

        SparseArray<DisplayPowerControllerInterface> followers;

        synchronized (mLock) {

        synchronized (mLock) {

            followers = mDisplayBrightnessFollowers.clone();

            mDisplayBrightnessFollowers.remove(follower.getDisplayId());

            mDisplayBrightnessFollowers.clear();

            mHandler.postAtTime(() -> follower.setBrightnessToFollow(

        }

                    PowerManager.BRIGHTNESS_INVALID_FLOAT, /* nits= */ -1,

        for (int i = 0; i < followers.size(); i++) {

                    /* ambientLux= */ 0), mClock.uptimeMillis());

            DisplayPowerControllerInterface follower = followers.valueAt(i);

            follower.setBrightnessToFollow(PowerManager.BRIGHTNESS_INVALID_FLOAT, /* nits= */ -1,

                    /* ambientLux= */ 0);

        }

        }

    }

    }
@@ -2242,6 +2248,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
            pw.println();

            pw.println();

            pw.println("Display Power Controller:");

            pw.println("Display Power Controller:");

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

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

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

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

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





            pw.println();

            pw.println();

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

+24 −8
Original line number Original line Diff line number Diff line
@@ -32,13 +32,18 @@ public interface DisplayPowerControllerInterface { 




    /**

    /**

     * Notified when the display is changed.

     * Notified when the display is changed.

     * We use this to apply any changes that might be needed

     *

     * when displays get swapped on foldable devices.

     * We use this to apply any changes that might be needed when displays get swapped on foldable

     * We also pass the High brightness mode metadata like

     * devices, when layouts change, etc.

     * remaining time and hbm events for the corresponding

     *

     * physical display, to update the values correctly.

     * Must be called while holding the SyncRoot lock.

     *

     * @param hbmInfo The high brightness mode metadata, like

     *                remaining time and hbm events, for the corresponding

     *                physical display, to make sure we stay within the safety margins.

     * @param leadDisplayId The display who is considered our "leader" for things like brightness.

     */

     */

    void onDisplayChanged(HighBrightnessModeMetadata hbmInfo);

    void onDisplayChanged(HighBrightnessModeMetadata hbmInfo, int leadDisplayId);





    /**

    /**

     * Unregisters all listeners and interrupts all running threads; halting future work.

     * Unregisters all listeners and interrupts all running threads; halting future work.
@@ -168,6 +173,16 @@ public interface DisplayPowerControllerInterface { 
     */

     */

    int getDisplayId();

    int getDisplayId();





    /**

     * Get the ID of the display that is the leader of this DPC.

     *

     * Note that this is different than the display associated with the DPC. The leader is another

     * display which we follow for things like brightness.

     *

     * Must be called while holding the SyncRoot lock.

     */

    int getLeadDisplayId();



    /**

    /**

     * Set the brightness to follow if this is an additional display in a set of concurrent

     * Set the brightness to follow if this is an additional display in a set of concurrent

     * displays.

     * displays.
@@ -187,7 +202,8 @@ public interface DisplayPowerControllerInterface { 
    void addDisplayBrightnessFollower(DisplayPowerControllerInterface follower);

    void addDisplayBrightnessFollower(DisplayPowerControllerInterface follower);





    /**

    /**

     * Clear all the additional displays following the brightness value of this display.

     * Removes the given display from the list of brightness followers.

     * @param follower The DPC to remove from the followers list

     */

     */

    void clearDisplayBrightnessFollowers();

    void removeDisplayBrightnessFollower(DisplayPowerControllerInterface follower);

}
 
}

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -848,9 +848,8 @@ final class LogicalDisplay { 
        }

        }

    }

    }





    public int getLeadDisplayLocked() {

    public int getLeadDisplayIdLocked() {

        return mLeadDisplayId;

        return mLeadDisplayId;



    }

    }





    public void dumpLocked(PrintWriter pw) {

    public void dumpLocked(PrintWriter pw) {