commit 4a17c50d7b735e1ab94748684f4a7be54fe1a0ce
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 26 22:56:28 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 26 22:56:28 2019 +0000
tree 6f74c7ac8774bce96cc4db664a0cb99294e84796
parent 95eb1bfbfa614546fed8ec032b1706e350a9f8df
parent 8c07e3ac3905e69a2ce94824623a39dafa0f58f3

Merge "Prevent NPE when current clock is null" into ub-launcher3-qt-r1-dev

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);