Merge "Fix NPE in DisplayModeDirector.isDozeState()." into sc-dev am: a8547003b3 am: de810cddb1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15482816 Change-Id: Ie4e5cdf871652328762280d24be03513a9bbcfd8
2021-08-07 03:11:52 +00:00
parent 11db47cd34 de810cddb1
commit 6448387dc5
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/display/DisplayModeDirector.java
+++ b/services/core/java/com/android/server/display/DisplayModeDirector.java
@@ -2524,6 +2524,9 @@ public class DisplayModeDirector {

        @Override
        public boolean isDozeState(Display d) {
+            if (d == null) {
+                return false;
+            }
            return Display.isDozeState(d.getState());
        }