commit 1c3efbc440cae2bfe74b3c28a9a1ee9bb6a6449c
author Keun young Park <keunyoung@google.com> Fri May 31 08:42:49 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri May 31 08:42:49 2019 -0700
tree 9c7bfdf8cc0f7f6ae0875aeba3618f2a1429d7e3
parent e174d316099a26c4662cbc393fc062e4bfc4ae62
parent 36d2b17108e2112ec4f26b86c10dac80baceb462

Merge "ColorDisplayService: Check for null content observer before unregistering" into qt-dev
am: 36d2b17108

Change-Id: I29cba386e8599f27b482dcffe69a5f39ea1df46c

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 b2420b5..64a9e00 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 @@
     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) {