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

Commit a2162f56 authored by Keun young Park's avatar Keun young Park
Browse files

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
parent f6f26e04

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) {