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

Commit 23e78432 authored by bsears's avatar bsears Committed by Automerger Merge Worker
Browse files

Merge "Revert "Send display-OFF event if that is initial state."" into sc-dev am: 16f93725 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia058c3e723588b249313c5888e7df69b4464940d
parents e7856121 16f93725

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

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

                                currentState = Display.STATE_ON;

                            } else {

                                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;

                                return; // old state and new state is off

                            }

                        }