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

Commit b1bd87b5 authored by Lingyu Feng's avatar Lingyu Feng Committed by Android (Google) Code Review
Browse files

Merge "Add logs for display content mode" into main

parents 01b614e0 174c49b5

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

+4 −0
Original line number Diff line number Diff line
@@ -1310,6 +1310,9 @@ public final class DisplayManagerService extends SystemService { 
            // No change in setting.

            return false;

        }



        Slog.i(TAG, "Update mirrorBuiltInDisplaySetting: " + mirrorBuiltInDisplay

                + ", shouldSendDisplayChangeEvent: " + shouldSendDisplayChangeEvent);

        mMirrorBuiltInDisplay = mirrorBuiltInDisplay;

        if (mFlags.isDisplayContentModeManagementEnabled()) {

            mLogicalDisplayMapper.forEachLocked(logicalDisplay -> {
@@ -3874,6 +3877,7 @@ public final class DisplayManagerService extends SystemService { 
            pw.println("  mStableDisplaySize=" + mStableDisplaySize);

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

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

            pw.println("  mMirrorBuiltInDisplaySetting=" + mMirrorBuiltInDisplay);



            if (mUserPreferredMode != null) {

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

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

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.graphics.Rect; 
import android.hardware.display.DisplayManagerInternal;

import android.util.ArraySet;

import android.util.DisplayMetrics;

import android.util.Slog;

import android.util.SparseArray;

import android.view.Display;

import android.view.DisplayEventReceiver;
@@ -1036,6 +1037,8 @@ final class LogicalDisplay { 
            return false;

        }



        final int displayId = getDisplayIdLocked();

        Slog.i(TAG, "Set canHostTasks for display " + displayId + ": " + canHostTasks);

        mCanHostTasks = canHostTasks;

        mBaseDisplayInfo.canHostTasks = canHostTasks;

        mInfo.set(null);