commit 9a338891e9481bc66b51a262180d0c139e3a106b
author Dan Gittik <dangittik@google.com> Wed Jan 30 18:52:37 2019 +0000
committer Dan Gittik <dangittik@google.com> Wed Jan 30 18:52:37 2019 +0000
tree 3d2b5a9016e62b4a3ae9d3dce3676c137bf1d8bf
parent b9dce652399db135232c3a4963929843fe89b535

Added null check to get brightness config.

Test: manual.

Change-Id: Id6cac44edf7b8202cb6b4f609bcfdac7a582249e
Fixes: 118615823

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

diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index db3928e..2a8462b 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -592,6 +592,9 @@
     }
 
     public BrightnessConfiguration getDefaultBrightnessConfiguration() {
+        if (mAutomaticBrightnessController == null) {
+            return null;
+        }
         return mAutomaticBrightnessController.getDefaultConfig();
     }