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

Commit 36d2b171 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 9b26440e a2162f56

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

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

    private void tearDown() {

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

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





        if (mContentObserver != null) {

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

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

        }





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

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

            if (mNightDisplayAutoMode != null) {

            if (mNightDisplayAutoMode != null) {