1 files changed, 6 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java
index b2c90be..3e7477c 100644
--- a/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java
@@ -132,6 +132,12 @@ public class TunerService extends SystemUI {
 
     public void reloadSetting(Uri uri) {
         String key = mListeningUris.get(uri);
+
+        // Handle possible null keys
+        if (TextUtils.isEmpty(key)) {
+            return;
+        }
+
         String value;
         if (uri.getAuthority().equals(CMSettings.AUTHORITY)) {
             value = CMSettings.Secure.getStringForUser(mContentResolver, key, mCurrentUser);