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

Commit 6539126a authored by Lingyu Feng's avatar Lingyu Feng
Browse files

Refresh LogicalDisplay.mCanHostTasks when mPrimaryDisplayDevice changes 

Bug: 427816070
Test: presubmit
Flag: EXEMPT bugfix
Change-Id: I2175254c42f8abeb76c67eae9b714eeae455dc37
parent dd099328

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

+9 −1
Original line number Diff line number Diff line
@@ -252,7 +252,9 @@ final class LogicalDisplay { 
        mIsAnisotropyCorrectionEnabled = isAnisotropyCorrectionEnabled;

        mAlwaysRotateDisplayDeviceEnabled = isAlwaysRotateDisplayDeviceEnabled;

        mSyncedResolutionSwitchEnabled = isSyncedResolutionSwitchEnabled;

        mCanHostTasks = (mDisplayId == Display.DEFAULT_DISPLAY);



        // No need to initialize mCanHostTasks here; it's handled in

        // DisplayManagerService#setupLogicalDisplay().

    }



    public void setDevicePositionLocked(int position) {
@@ -1044,6 +1046,12 @@ final class LogicalDisplay { 
        mBaseDisplayInfo.copyFrom(EMPTY_DISPLAY_INFO);

        mInfo.set(null);



        // Since mCanHostTasks depends on mPrimaryDisplayDevice, we should refresh mCanHostTasks

        // when mPrimaryDisplayDevice changes.

        if (device != null) {

            mCanHostTasks = validateCanHostTasksLocked(mCanHostTasks);

        }



        return old;

    }

services/tests/displayservicetests/src/com/android/server/display/LogicalDisplayTest.java

+0 −1
Original line number Diff line number Diff line
@@ -631,7 +631,6 @@ public class LogicalDisplayTest { 
    @Test

    public void testSetCanHostTasks_defaultDisplay() {

        mLogicalDisplay = new LogicalDisplay(Display.DEFAULT_DISPLAY, LAYER_STACK, mDisplayDevice);

        assertTrue(mLogicalDisplay.canHostTasksLocked());



        mLogicalDisplay.setCanHostTasksLocked(true);

        assertTrue(mLogicalDisplay.canHostTasksLocked());