From 8c07e3ac3905e69a2ce94824623a39dafa0f58f3 Mon Sep 17 00:00:00 2001 From: Santiago Etchebehere Date: Wed, 26 Jun 2019 15:36:41 -0700 Subject: Prevent NPE when current clock is null Fixes: 136112716 Change-Id: I2c4cae0b5b8c7d3078a9cc5883ba68eab3a84658 --- src/com/android/customization/model/clock/ClockManager.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/com/android/customization/model/clock/ClockManager.java b/src/com/android/customization/model/clock/ClockManager.java index 180d3a0c..4e77a494 100644 --- a/src/com/android/customization/model/clock/ClockManager.java +++ b/src/com/android/customization/model/clock/ClockManager.java @@ -17,6 +17,7 @@ package com.android.customization.model.clock; import android.content.ContentResolver; import android.provider.Settings.Secure; +import android.text.TextUtils; import com.android.customization.module.ThemesUserEventLogger; @@ -64,6 +65,9 @@ public class ClockManager extends BaseClockManager { @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); -- cgit v1.2.3