Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecfc005f authored by George Lin's avatar George Lin
Browse files

Fix crash at clock carousel 

Make sure to assign the accessiblity delegate after the adapter is
initialized. This is to avoid unexpceted crash caused transitionToNext
which might access to the adapter that is not yet initiailzed.

Test: Manully tested clock carousel still works
Bug: 309161842
Flag: None
Change-Id: I0d6de24c4bd86892808d1610cc8a300d20c9c2e7
parent 63ca378c

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

+5 −5
Original line number Diff line number Diff line
@@ -58,11 +58,6 @@ object ClockCarouselViewBinder { 
                    carouselView.transitionToPrevious()

                }

            )

        screenPreviewClickView.accessibilityDelegate = carouselAccessibilityDelegate

        screenPreviewClickView.setOnSideClickedListener { isStart ->

            if (isStart) carouselView.scrollToPrevious() else carouselView.scrollToNext()

        }



        lifecycleOwner.lifecycleScope.launch {

            lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {

                launch {
@@ -76,6 +71,11 @@ object ClockCarouselViewBinder { 
                            },

                            isTwoPaneAndSmallWidth = isTwoPaneAndSmallWidth,

                        )

                        screenPreviewClickView.accessibilityDelegate = carouselAccessibilityDelegate

                        screenPreviewClickView.setOnSideClickedListener { isStart ->

                            if (isStart) carouselView.scrollToPrevious()

                            else carouselView.scrollToNext()

                        }

                    }

                }