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

2021-02-24 15:05:38 +00:00
parent d00355cd6a a60654e05c
commit 7fe46bae14
1 changed files with 6 additions and 1 deletions
--- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java
+++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
@@ -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;
                            }
                        }