commit | d548ddf6de817ddce0a535701e9a1f61701befa3 | [log] [tgz] |
---|---|---|
author | Abdullah Tabassum <abdullahirum@google.com> | Fri Jun 02 18:54:14 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 02 18:54:14 2023 +0000 |
tree | 55c347ed049e5f20a1a003c785fb8bc38ff59b18 | |
parent | cc922627a1a749d8d775e9be9650264f889356c6 [diff] | |
parent | 57073d324d885b857722a965583aad26b1450780 [diff] |
Merge "Resolve NPE when user updates display size" into udc-dev am: f4425cdf3c am: 57073d324d Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/23516903 Change-Id: Ib3b837b5a773c2bfc59548fca6e2666cc98cf025 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) } } }