commit b0202799528fe70a045224b1151c1720ef224aa8
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Apr 13 03:10:22 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 13 03:10:23 2016 +0000
tree a8bfc56202ae8ae30000b4e91264dec859536e7c
parent 0dc92ca5a7ff767dd3a0bfbcd15db328a690a761
parent c9d064a380084796217d08fb459c9ecab022f596

Merge "Added null check in appendSettingToCursor" into nyc-dev

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 640399f..8dc247a 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -1324,6 +1324,9 @@
     }
 
     private static void appendSettingToCursor(MatrixCursor cursor, Setting setting) {
+        if (setting == null) {
+            return;
+        }
         final int columnCount = cursor.getColumnCount();
 
         String[] values =  new String[columnCount];