From c49f266af0f834ef6db1d53fab80ab8fbfcbb382 Mon Sep 17 00:00:00 2001 From: Jay Aliomer Date: Thu, 21 Nov 2019 10:44:57 -0500 Subject: [PATCH] DarkUIPreferenceController null exception The DarkUIPreferenceController doesnt need to show dialog in all cases we added a null check for mFragment Fixes: 144899194 Test: atest DarkUIPreferenceControllerTest Change-Id: Ia5ed89bd46f28f4b92d955911223f9157e55c622 --- .../android/settings/display/DarkUIPreferenceController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/com/android/settings/display/DarkUIPreferenceController.java b/src/com/android/settings/display/DarkUIPreferenceController.java index dfbe69ee86a..20683c70629 100644 --- a/src/com/android/settings/display/DarkUIPreferenceController.java +++ b/src/com/android/settings/display/DarkUIPreferenceController.java @@ -32,7 +32,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; -import com.android.settings.display.darkmode.DarkModePreference; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; @@ -99,7 +98,7 @@ public class DarkUIPreferenceController extends TogglePreferenceController imple private void showDarkModeDialog() { final DarkUIInfoDialogFragment frag = new DarkUIInfoDialogFragment(); - if (mFragment.getFragmentManager() != null) { + if (mFragment != null && mFragment.getFragmentManager() != null) { frag.show(mFragment.getFragmentManager(), getClass().getName()); } }