From 980fc0e14530a31a0ced603303bfc6c22f1519f1 Mon Sep 17 00:00:00 2001
From: Yuncheol Heo <ycheo@google.com>
Date: Fri, 6 Aug 2021 11:08:33 -0700
Subject: [PATCH] Fix NPE in DisplayModeDirector.isDozeState().

Bug: 195754077
Test: atest android.app.activity.ActivityThreadTest
Change-Id: I1ed70ea2c020ab7e9e997e3657b968fb0001164e
---
 .../java/com/android/server/display/DisplayModeDirector.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/display/DisplayModeDirector.java b/services/core/java/com/android/server/display/DisplayModeDirector.java
index 186986e17c142..17e8cd6e9a073 100644
--- a/services/core/java/com/android/server/display/DisplayModeDirector.java
+++ b/services/core/java/com/android/server/display/DisplayModeDirector.java
@@ -2519,6 +2519,9 @@ public class DisplayModeDirector {
 
         @Override
         public boolean isDozeState(Display d) {
+            if (d == null) {
+                return false;
+            }
             return Display.isDozeState(d.getState());
         }