commit 16eaf08f5a47a677229b1eb6ab6dcaad6f01c47d
author Christine Franks <christyfranks@google.com> Fri Mar 08 19:30:01 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 08 19:30:01 2019 +0000
tree 1c30a9be1741e52377d00a01650f856f29c8c809
parent b80a06a88af2d2c96cb141d3280c02c099c3bd34
parent 4478261d1e02e48ff518e870f800618146a06e82

Merge "Prevent querying settings when no active user"

services/core/java/com/android/server/display/color/ColorDisplayService.java

diff --git a/services/core/java/com/android/server/display/color/ColorDisplayService.java b/services/core/java/com/android/server/display/color/ColorDisplayService.java
index b1e5510..2311776 100644
--- a/services/core/java/com/android/server/display/color/ColorDisplayService.java
+++ b/services/core/java/com/android/server/display/color/ColorDisplayService.java
@@ -1276,11 +1276,17 @@
         }
 
         boolean isActivatedSetting() {
+            if (mCurrentUser == UserHandle.USER_NULL) {
+                return false;
+            }
             return Secure.getIntForUser(getContext().getContentResolver(),
                     Secure.NIGHT_DISPLAY_ACTIVATED, 0, mCurrentUser) == 1;
         }
 
         int getColorTemperatureSetting() {
+            if (mCurrentUser == UserHandle.USER_NULL) {
+                return NOT_SET;
+            }
             return clampNightDisplayColorTemperature(Secure.getIntForUser(
                     getContext().getContentResolver(), Secure.NIGHT_DISPLAY_COLOR_TEMPERATURE,
                     NOT_SET,