commit 80b9eece914acb316c62a57a2397d10a36bdea74
author Abdullah Tabassum <abdullahirum@google.com> Fri Jun 02 18:30:43 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 02 18:30:43 2023 +0000
tree 55c347ed049e5f20a1a003c785fb8bc38ff59b18
parent 4a7b92c24078d35336fab04b7c7f1688152c7de0
parent 4a723a18cf9749a2837ee24db5922af318bd45d4

Merge "Resolve NPE when user updates display size" into udc-dev am: f4425cdf3c am: 4a723a18cf

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/23516903

Change-Id: I5c76075c855063413b484e7e05234265a297b109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt

diff --git a/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt b/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt
index d8c5dce..053ac55 100644
--- a/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt
+++ b/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt
@@ -159,11 +159,12 @@
                         if (selectedPosition != -1) {
                             val colorOptionContainerListView: LinearLayout =
                                 view.requireViewById(R.id.color_options)
+
                             val selectedView =
-                                colorOptionContainerListView.requireViewById<View>(
+                                colorOptionContainerListView.findViewById<View>(
                                     COLOR_PICKER_ITEM_PREFIX_ID + selectedPosition
                                 )
-                            selectedView.parent.requestChildFocus(selectedView, selectedView)
+                            selectedView?.parent?.requestChildFocus(selectedView, selectedView)
                         }
                     }
                 }