commit 441b37ae4df15282ce4a78ec7709f0e130f93ba0
author Hawkwood Glazier <jglazier@google.com> Wed Aug 16 17:35:56 2023 +0000
committer Hawkwood Glazier <jglazier@google.com> Thu Aug 17 21:32:58 2023 +0000
tree 55132c05cef91da458aa4ac9cda41733f599fac6
parent c84064124eed14e09767a6714dbfdf9a574a3537

Select the default clock if current clock id was not found

Bug: 295371293
Test: Manually tested invalid clock ids
Change-Id: 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 aeed45e..004103f 100644
--- a/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt
+++ b/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt
@@ -53,11 +53,12 @@
     override val allClocks: Flow<List<ClockMetadataModel>> =
         callbackFlow {
                 fun send() {
+                    val activeClockId = registry.activeClockId
                     val allClocks =
-                        registry
-                            .getClocks()
-                            .filter { "NOT_IN_USE" !in it.clockId }
-                            .map { it.toModel(isSelected = it.clockId == registry.currentClockId) }
+                        registry.getClocks().map {
+                            it.toModel(isSelected = it.clockId == activeClockId)
+                        }
+
                     trySend(allClocks)
                 }
 
@@ -84,12 +85,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(
                                 isSelected = true,
                                 selectedColorId = metadata?.getSelectedColorId(),