Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-31 15:33:32 +00:00
committed by Android (Google) Code Review
parent 9b26440e86 a2162f56d8
commit 36d2b17108
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/display/color/ColorDisplayService.java
View File

@@ -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);
getContext().getContentResolver().unregisterContentObserver(mContentObserver); if (mContentObserver != null) {
getContext().getContentResolver().unregisterContentObserver(mContentObserver);
}
if (mNightDisplayTintController.isAvailable(getContext())) { if (mNightDisplayTintController.isAvailable(getContext())) {
if (mNightDisplayAutoMode != null) { if (mNightDisplayAutoMode != null) {