commit 01e207ede74dad68f45428bf788b1f55fdea920c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Nov 07 02:58:40 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 07 02:58:40 2023 +0000
tree 576eb6e1e3157a3dd4346437f1273667ca248678
parent 2ddabf5785539cf1c02ab24dc72a803c561b4a46
parent 9ad7284d3f4eeacca9aa385dea02c71c39a683f8

Merge "Check if the bedtime settings intent is null before launch" into main

src/com/android/settings/display/darkmode/DarkModeCustomBedtimePreferenceController.java

diff --git a/src/com/android/settings/display/darkmode/DarkModeCustomBedtimePreferenceController.java b/src/com/android/settings/display/darkmode/DarkModeCustomBedtimePreferenceController.java
index c6e379c..488befb 100644
--- a/src/com/android/settings/display/darkmode/DarkModeCustomBedtimePreferenceController.java
+++ b/src/com/android/settings/display/darkmode/DarkModeCustomBedtimePreferenceController.java
@@ -20,6 +20,7 @@
 
 import android.app.UiModeManager;
 import android.content.Context;
+import android.content.Intent;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
@@ -52,7 +53,12 @@
         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));
     }