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

am: b020279

* commit 'b0202799528fe70a045224b1151c1720ef224aa8':
  Added null check in appendSettingToCursor

Change-Id: Iaf678dd04e6ee911452fd70319fc458ba39673cf

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

@@ -1324,6 +1324,9 @@ public class SettingsProvider extends ContentProvider {
     }
 
     private static void appendSettingToCursor(MatrixCursor cursor, Setting setting) {
+        if (setting == null) {
+            return;
+        }
         final int columnCount = cursor.getColumnCount();
 
         String[] values =  new String[columnCount];