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

Commit f9967f7a authored by Piotr Wilczyński's avatar Piotr Wilczyński Committed by Android (Google) Code Review
Browse files

Merge "Changing the default display should depend on... 

Merge "Changing the default display should depend on PROPERTY_LAPTOP_HARDWARE_CONFIGURATION_DOCKED" into main
parents 8afe3c41 adfb72d9

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

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.server.display;



import static android.hardware.devicestate.DeviceState.PROPERTY_EMULATED_ONLY;

import static android.hardware.devicestate.DeviceState.PROPERTY_LAPTOP_HARDWARE_CONFIGURATION_LID_CLOSED;

import static android.hardware.devicestate.DeviceState.PROPERTY_LAPTOP_HARDWARE_CONFIGURATION_DOCKED;

import static android.hardware.devicestate.DeviceState.PROPERTY_POWER_CONFIGURATION_TRIGGER_SLEEP;

import static android.hardware.devicestate.DeviceState.PROPERTY_POWER_CONFIGURATION_TRIGGER_WAKE;

import static android.hardware.devicestate.DeviceStateManager.INVALID_DEVICE_STATE;
@@ -538,7 +538,7 @@ class LogicalDisplayMapper implements DisplayDeviceRepository.Listener { 
        }



        if (Flags.changeDefaultDisplayLidClosed() && state.hasProperty(

                PROPERTY_LAPTOP_HARDWARE_CONFIGURATION_LID_CLOSED)) {

                PROPERTY_LAPTOP_HARDWARE_CONFIGURATION_DOCKED)) {

            createLayoutWithDefaultSecondaryDisplayLocked(state.getIdentifier());

        }
@@ -1487,7 +1487,7 @@ class LogicalDisplayMapper implements DisplayDeviceRepository.Listener { 
    private boolean findNewDefaultSecondaryDisplayIfNeededLocked(

            DisplayDevice removedDisplayDevice) {

        if (!Flags.changeDefaultDisplayLidClosed() || !mDeviceState.hasProperty(

                PROPERTY_LAPTOP_HARDWARE_CONFIGURATION_LID_CLOSED)) {

                PROPERTY_LAPTOP_HARDWARE_CONFIGURATION_DOCKED)) {

            return false;

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ public class LogicalDisplayMapperTest { 
    private static final DeviceState DEVICE_STATE_EMULATED = createDeviceState(3, "Three",

            Set.of(DeviceState.PROPERTY_EMULATED_ONLY), Collections.emptySet());

    private static final DeviceState DEVICE_STATE_DOCKED = createDeviceState(4, "Docked",

            Set.of(DeviceState.PROPERTY_LAPTOP_HARDWARE_CONFIGURATION_LID_CLOSED),

            Set.of(DeviceState.PROPERTY_LAPTOP_HARDWARE_CONFIGURATION_DOCKED),

            Collections.emptySet());

    private static final int FLAG_GO_TO_SLEEP_ON_FOLD = 0;

    private static final int FLAG_GO_TO_SLEEP_FLAG_SOFT_SLEEP = 2;