From 9ad7284d3f4eeacca9aa385dea02c71c39a683f8 Mon Sep 17 00:00:00 2001 From: Steven Ng Date: Fri, 3 Nov 2023 19:25:03 +0000 Subject: [PATCH] Check if the bedtime settings intent is null before launch Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.display.darkmode.* Bug: 306060498 Change-Id: Iddaec94c3a4cba74841d83305e581605c030bf33 --- .../DarkModeCustomBedtimePreferenceController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/display/darkmode/DarkModeCustomBedtimePreferenceController.java b/src/com/android/settings/display/darkmode/DarkModeCustomBedtimePreferenceController.java index c6e379cf621..488befb43ea 100644 --- a/src/com/android/settings/display/darkmode/DarkModeCustomBedtimePreferenceController.java +++ b/src/com/android/settings/display/darkmode/DarkModeCustomBedtimePreferenceController.java @@ -20,6 +20,7 @@ import static android.app.UiModeManager.MODE_NIGHT_CUSTOM_TYPE_BEDTIME; import android.app.UiModeManager; import android.content.Context; +import android.content.Intent; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; @@ -52,7 +53,12 @@ public class DarkModeCustomBedtimePreferenceController extends BasePreferenceCon super.displayPreference(screen); mFooterPreference = screen.findPreference(getPreferenceKey()); mFooterPreference.setLearnMoreAction( - v -> v.getContext().startActivity(mBedtimeSettings.getBedtimeSettingsIntent())); + v -> { + Intent bedtimeSettingsIntent = mBedtimeSettings.getBedtimeSettingsIntent(); + if (bedtimeSettingsIntent != null) { + v.getContext().startActivity(bedtimeSettingsIntent); + } + }); mFooterPreference.setLearnMoreText( mContext.getString(R.string.dark_ui_bedtime_footer_action)); }