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

Commit d6a7bfed authored by Santos Cordon's avatar Santos Cordon Committed by Automerger Merge Worker
Browse files

Merge "Send display-OFF event if that is initial state." into sc-dev am: 7fe46bae 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13583070

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a2691f038b2a3c75dc9ad0b7d8224f3791a0bda
parents ed12751b 7fe46bae

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

+6 −1
Original line number Diff line number Diff line
@@ -718,7 +718,12 @@ final class LocalDisplayAdapter extends DisplayAdapter { 
                                setDisplayState(Display.STATE_ON);

                                currentState = Display.STATE_ON;

                            } else {

                                return; // old state and new state is off

                                if (oldState == Display.STATE_UNKNOWN) {

                                    // There's no guarantee about what the initial state is

                                    // at startup, so we have to set it if previous was UNKNOWN.

                                    setDisplayState(state);

                                }

                                return;

                            }

                        }