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

Commit 2c19857c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Re-add check for invalid device state" into main

parents 74a2a462 15e8acb3

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

+6 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.content.Context;

import android.hardware.devicestate.DeviceState;

import android.hardware.devicestate.DeviceStateManager;

import android.hardware.devicestate.feature.flags.FeatureFlags;

import android.hardware.devicestate.feature.flags.FeatureFlagsImpl;

import android.os.Handler;
@@ -614,7 +615,11 @@ class LogicalDisplayMapper implements DisplayDeviceRepository.Listener { 
                    && isBootCompleted

                    && !mFoldSettingProvider.shouldStayAwakeOnFold();

        } else {

            return mDeviceStatesOnWhichToSelectiveSleep.get(pendingState.getIdentifier())

            return currentState.getIdentifier()

                    != DeviceStateManager.INVALID_DEVICE_STATE_IDENTIFIER

                    && pendingState.getIdentifier()

                    != DeviceStateManager.INVALID_DEVICE_STATE_IDENTIFIER

                    && mDeviceStatesOnWhichToSelectiveSleep.get(pendingState.getIdentifier())

                    && !mDeviceStatesOnWhichToSelectiveSleep.get(currentState.getIdentifier())

                    && isInteractive

                    && isBootCompleted