commit e71e4fc1634df44e14471e1cd2b3515b44c3aa3a
author Hawkwood Glazier <jglazier@google.com> Wed Aug 16 17:35:56 2023 +0000
committer Hawkwood Glazier <jglazier@google.com> Tue Aug 22 14:45:37 2023 +0000
tree bf0cae57e9e12cfecc664396e7d1340f8659d573
parent 9e1f371489fe9ce9936bc9917daa928c01d77593

Select the default clock if current clock id was not found

Bug: 295371293
Test: Manually tested invalid clock ids
Change-Id: Iff766fdb9ef5c914eda5454686d8181562748dec
Merged-In: Iff766fdb9ef5c914eda5454686d8181562748dec

src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt

diff --git a/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt b/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt
index be6c6cb..370668e 100644
--- a/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt
+++ b/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt
@@ -52,11 +52,9 @@
     override val allClocks: Flow<List<ClockMetadataModel>> =
         callbackFlow {
                 fun send() {
-                    val allClocks =
-                        registry
-                            .getClocks()
-                            .filter { "NOT_IN_USE" !in it.clockId }
-                            .map { it.toModel() }
+                    val activeClockId = registry.activeClockId
+                    val allClocks = registry.getClocks().map { it.toModel() }
+
                     trySend(allClocks)
                 }
 
@@ -83,12 +81,12 @@
     override val selectedClock: Flow<ClockMetadataModel> =
         callbackFlow {
                 fun send() {
-                    val currentClockId = registry.currentClockId
+                    val activeClockId = registry.activeClockId
                     val metadata = registry.settings?.metadata
                     val model =
                         registry
                             .getClocks()
-                            .find { clockMetadata -> clockMetadata.clockId == currentClockId }
+                            .find { clockMetadata -> clockMetadata.clockId == activeClockId }
                             ?.toModel(
                                 selectedColorId = metadata?.getSelectedColorId(),
                                 colorTone = metadata?.getColorTone()