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

Commit fc031a9a authored by Fiona Campbell's avatar Fiona Campbell Committed by Automerger Merge Worker
Browse files

Merge "Add displayId to DPC logs" into sc-dev am: 1d509e2e 

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

Change-Id: I26ef1c7c8ffad1cfb81d96cd43be4029d3e89bfd
parents f02dae34 1d509e2e

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

+3 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ import java.io.PrintWriter; 
 */

final class DisplayPowerController implements AutomaticBrightnessController.Callbacks,

        DisplayWhiteBalanceController.Callbacks {

    private static final String TAG = "DisplayPowerController";

    private static final String SCREEN_ON_BLOCKED_TRACE_NAME = "Screen on blocked";

    private static final String SCREEN_OFF_BLOCKED_TRACE_NAME = "Screen off blocked";
@@ -149,6 +148,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
    private static final int REPORTED_TO_POLICY_SCREEN_ON = 2;

    private static final int REPORTED_TO_POLICY_SCREEN_TURNING_OFF = 3;



    private final String TAG;



    private final Object mLock = new Object();



    private final Context mContext;
@@ -450,6 +451,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
            Runnable onBrightnessChangeRunnable) {

        mLogicalDisplay = logicalDisplay;

        mDisplayId = mLogicalDisplay.getDisplayIdLocked();

        TAG = "DisplayPowerController[" + mDisplayId + "]";

        mDisplayDevice = mLogicalDisplay.getPrimaryDisplayDeviceLocked();

        mUniqueDisplayId = logicalDisplay.getPrimaryDisplayDeviceLocked().getUniqueId();

        mHandler = new DisplayControllerHandler(handler.getLooper());