commit f6cf7f49157917b711caba0dc7a250513d74adff
author Oleg Kibirev <olegk@google.com> Tue Sep 03 18:57:37 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 03 18:57:37 2024 +0000
tree a0ed99f148d0958576605f10244f22887463fce8
parent 06b59c640deec410fe34593fe504c2834b1a6500
parent dd605644fbf25b8a8d5e1dd4f0fe1e6265ba04f6

Merge "Fix NullPointerException on sliceInputsPreference" into main

Settings/src/com/android/tv/settings/MainFragment.java

diff --git a/Settings/src/com/android/tv/settings/MainFragment.java b/Settings/src/com/android/tv/settings/MainFragment.java
index 3cf455a..d71da79 100644
--- a/Settings/src/com/android/tv/settings/MainFragment.java
+++ b/Settings/src/com/android/tv/settings/MainFragment.java
@@ -207,7 +207,9 @@
         updateBasicModeSuggestion();
 
         SlicePreference sliceInputsPreference = findPreference(KEY_CHANNELS_AND_INPUTS_SLICE);
-        if (!SliceUtils.isSliceProviderValid(requireContext(), sliceInputsPreference.getUri())) {
+        if (sliceInputsPreference != null
+                && !SliceUtils.isSliceProviderValid(
+                        requireContext(), sliceInputsPreference.getUri())) {
             sliceInputsPreference.setUri(
                     getString(R.string.channels_and_inputs_fallback_slice_uri));
         }