From d385f524f00462b863fef2aefa763a5d180db5af 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 (cherry picked from commit c49f266af0f834ef6db1d53fab80ab8fbfcbb382) --- .../android/settings/display/DarkUIPreferenceController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/display/DarkUIPreferenceController.java b/src/com/android/settings/display/DarkUIPreferenceController.java index d3d30b50221..b85511d8bd8 100644 --- a/src/com/android/settings/display/DarkUIPreferenceController.java +++ b/src/com/android/settings/display/DarkUIPreferenceController.java @@ -100,7 +100,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()); } }