commit 86c300e721377fc4081a7f424e3b58cc422c5c15
author Catherine Liang <cathliang@google.com> Fri Nov 03 09:45:17 2023 +0800
committer Catherine Liang <cathliang@google.com> Wed Nov 08 19:05:53 2023 +0000
tree fcc52f5816188796bde371d3a9400a80f6a0d336
parent f263efdb18f0144185c99ac63c415291b220ebe5

Fix color logging crash

Bug: 309005949
Test: manually tested different wallpaper & other color options
Flag: NONE
Change-Id: I511c78a12aec1c7544c75ad7c5034c1c7d739012

src/com/android/customization/model/color/ColorOption.java

diff --git a/src/com/android/customization/model/color/ColorOption.java b/src/com/android/customization/model/color/ColorOption.java
index 3035221..77fe404 100644
--- a/src/com/android/customization/model/color/ColorOption.java
+++ b/src/com/android/customization/model/color/ColorOption.java
@@ -112,6 +112,9 @@
         if (seedColor == null || seedColor.isEmpty()) {
             return ThemesUserEventLogger.NULL_SEED_COLOR;
         }
+        if (!seedColor.startsWith("#")) {
+            seedColor = "#" + seedColor;
+        }
         return Color.parseColor(seedColor);
     }
 

tests/robotests/src/com/android/customization/model/picker/color/ui/viewmodel/ColorPickerViewModelTest.kt

diff --git a/tests/robotests/src/com/android/customization/model/picker/color/ui/viewmodel/ColorPickerViewModelTest.kt b/tests/robotests/src/com/android/customization/model/picker/color/ui/viewmodel/ColorPickerViewModelTest.kt
index c841267..6617582 100644
--- a/tests/robotests/src/com/android/customization/model/picker/color/ui/viewmodel/ColorPickerViewModelTest.kt
+++ b/tests/robotests/src/com/android/customization/model/picker/color/ui/viewmodel/ColorPickerViewModelTest.kt
@@ -130,7 +130,7 @@
                     repository.buildWallpaperOption(
                         ColorOptionsProvider.COLOR_SOURCE_LOCK,
                         Style.EXPRESSIVE,
-                        "#121212"
+                        "121212"
                     )
                 ),
                 listOf(repository.buildPresetOption(Style.FRUIT_SALAD, "#ABCDEF")),
@@ -161,7 +161,7 @@
                     repository.buildWallpaperOption(
                         ColorOptionsProvider.COLOR_SOURCE_LOCK,
                         Style.EXPRESSIVE,
-                        "#121212"
+                        "121212"
                     )
                 ),
                 listOf(repository.buildPresetOption(Style.FRUIT_SALAD, "#ABCDEF")),