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

Commit 85e44fd0 authored by Fiona Campbell's avatar Fiona Campbell Committed by Android (Google) Code Review
Browse files

Merge "Fix up LogicalDisplayMapper"

parents 35909fc1 0d0dd7f8

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

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ public final class DisplayManagerService extends SystemService { 
        mUiHandler = UiThread.getHandler();

        mDisplayDeviceRepo = new DisplayDeviceRepository(mSyncRoot, mPersistentDataStore);

        mLogicalDisplayMapper = new LogicalDisplayMapper(context, mDisplayDeviceRepo,

                new LogicalDisplayListener(), mPersistentDataStore);

                new LogicalDisplayListener());

        mDisplayModeDirector = new DisplayModeDirector(context, mHandler);

        Resources resources = mContext.getResources();

        mDefaultDisplayDefaultColorMode = mContext.getResources().getInteger(

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

+3 −6
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ import android.content.Context; 
import android.os.Process;

import android.os.SystemProperties;

import android.text.TextUtils;

import android.util.IndentingPrintWriter;

import android.util.Slog;

import android.util.SparseArray;

import android.view.Display;

import android.view.DisplayEventReceiver;

import android.view.DisplayInfo;



import com.android.internal.util.IndentingPrintWriter;



import java.io.PrintWriter;

import java.util.Arrays;
@@ -102,13 +102,10 @@ class LogicalDisplayMapper implements DisplayDeviceRepository.Listener { 
    private final SparseArray<DisplayGroup> mDisplayGroups = new SparseArray<>();



    private final DisplayDeviceRepository mDisplayDeviceRepo;

    private final PersistentDataStore mPersistentDataStore;

    private final Listener mListener;



    LogicalDisplayMapper(Context context, DisplayDeviceRepository repo, Listener listener,

            PersistentDataStore persistentDataStore) {

    LogicalDisplayMapper(Context context, DisplayDeviceRepository repo, Listener listener) {

        mDisplayDeviceRepo = repo;

        mPersistentDataStore = persistentDataStore;

        mListener = listener;

        mSingleDisplayDemoMode = SystemProperties.getBoolean("persist.demo.singledisplay", false);

        mDisplayDeviceRepo.addListener(this);
@@ -238,7 +235,7 @@ class LogicalDisplayMapper implements DisplayDeviceRepository.Listener { 
        // Find the associated LogicalDisplays for the configured "folding" DeviceDisplays.

        final LogicalDisplay displayFolded = getLocked(deviceFolded);

        final LogicalDisplay displayUnfolded = getLocked(deviceUnfolded);

        if (displayFolded == null || displayFolded == null) {

        if (displayFolded == null || displayUnfolded == null) {

            // If the expected displays are not present, return early.

            return;

        }