commit fe5ebfec7f6e083c0084591391bd35940798c63f
author Hawkwood Glazier <jglazier@google.com> Thu Jan 30 07:53:14 2025 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 30 07:53:14 2025 -0800
tree 0a90a61dc7019b8a4615d410ba9345ad581bb379
parent 1a1e4f5cbc297c8a468d10d2b8739a385bb7d08e
parent 949898a5a9fa7b91083e9dd037fa4afff850af7b

Merge "Remove erronous failure log" into main

packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt

diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt
index 12b20a5..ab31286 100644
--- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt
+++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockRegistry.kt
@@ -299,8 +299,7 @@
                             Settings.Secure.LOCK_SCREEN_CUSTOM_CLOCK_FACE,
                         )
                     }
-
-                ClockSettings.fromJson(JSONObject(json))
+                json?.let { ClockSettings.fromJson(JSONObject(it)) }
             } catch (ex: Exception) {
                 logger.e("Failed to parse clock settings", ex)
                 null