From a2162f56d88f192a0a10c965554b3b3fdeabfbc0 Mon Sep 17 00:00:00 2001
From: Keun young Park <keunyoung@google.com>
Date: Wed, 29 May 2019 11:33:11 -0700
Subject: [PATCH] ColorDisplayService: Check for null content observer before
 unregistering

- Early user switching in car env can lead into NPE

Bug: 133857745
Test: boot in car env
Change-Id: I3d2f67f1a57fc1f7dabb43d4917bbe3d83492852
---
 .../com/android/server/display/color/ColorDisplayService.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 b2420b5b320ea..64a9e0074cb1e 100644
--- a/services/core/java/com/android/server/display/color/ColorDisplayService.java
+++ b/services/core/java/com/android/server/display/color/ColorDisplayService.java
@@ -394,7 +394,9 @@ public final class ColorDisplayService extends SystemService {
     private void tearDown() {
         Slog.d(TAG, "tearDown: currentUser=" + mCurrentUser);
 
-        getContext().getContentResolver().unregisterContentObserver(mContentObserver);
+        if (mContentObserver != null) {
+            getContext().getContentResolver().unregisterContentObserver(mContentObserver);
+        }
 
         if (mNightDisplayTintController.isAvailable(getContext())) {
             if (mNightDisplayAutoMode != null) {