Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c3efbc4 authored by Keun young Park's avatar Keun young Park Committed by android-build-merger
Browse files

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

am: 36d2b171

Change-Id: I29cba386e8599f27b482dcffe69a5f39ea1df46c
parents e174d316 36d2b171

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

+3 −1
Original line number Diff line number Diff line
@@ -394,7 +394,9 @@ public final class ColorDisplayService extends SystemService { 
    private void tearDown() {

        Slog.d(TAG, "tearDown: currentUser=" + mCurrentUser);



        if (mContentObserver != null) {

            getContext().getContentResolver().unregisterContentObserver(mContentObserver);

        }



        if (mNightDisplayTintController.isAvailable(getContext())) {

            if (mNightDisplayAutoMode != null) {