commit 8c07e3ac3905e69a2ce94824623a39dafa0f58f3
author Santiago Etchebehere <santie@google.com> Wed Jun 26 15:36:41 2019 -0700
committer Santiago Etchebehere <santie@google.com> Wed Jun 26 15:36:41 2019 -0700
tree f78dc8bec0763439434b4a164351fd002fe4b261
parent aa5456ac7bfa97ce79db4580618b1b3a0c990c60

Prevent NPE when current clock is null

Fixes: 136112716
Change-Id: I2c4cae0b5b8c7d3078a9cc5883ba68eab3a84658

src/com/android/customization/model/clock/ClockManager.java

diff --git a/src/com/android/customization/model/clock/ClockManager.java b/src/com/android/customization/model/clock/ClockManager.java
index 180d3a0..4e77a49 100644
--- a/src/com/android/customization/model/clock/ClockManager.java
+++ b/src/com/android/customization/model/clock/ClockManager.java
@@ -17,6 +17,7 @@
 
 import android.content.ContentResolver;
 import android.provider.Settings.Secure;
+import android.text.TextUtils;
 
 import com.android.customization.module.ThemesUserEventLogger;
 
@@ -64,6 +65,9 @@
     @Override
     protected String lookUpCurrentClock() {
         final String value = Secure.getString(mContentResolver, CLOCK_FACE_SETTING);
+        if (TextUtils.isEmpty(value)) {
+            return value;
+        }
         try {
             final JSONObject json = new JSONObject(value);
             return json.getString(CLOCK_FIELD);