| commit | 1b0164c9db1c6d742178d7b71463597fb7554e4c | [log] [tgz] |
|---|---|---|
| author | Abdullah Tabassum <abdullahirum@google.com> | Fri Jun 02 19:19:28 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 02 19:19:28 2023 +0000 |
| tree | be7d44cd9f0bff3bc6ab116c12c6939ca18287d4 | |
| parent | d6856b41d9ab24a7ba912caefc0e8f7cd4c4669c [diff] | |
| parent | 26d63dacebf18d3806dcffb1a64a423463b9883d [diff] |
Merge "Resolve NPE when user updates display size" into udc-dev am: f4425cdf3c am: 4a723a18cf am: 26d63daceb Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/23516903 Change-Id: I84d57903d5c9d5ba980bc8851cdc8e88657addd8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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) } } }