commit c9d064a380084796217d08fb459c9ecab022f596
author Suprabh Shukla <suprabh@google.com> Tue Apr 12 18:45:34 2016 -0700
committer Suprabh Shukla <suprabh@google.com> Tue Apr 12 18:45:41 2016 -0700
tree 2e7cdbcf8047485fe5e51c9c8d7009c3d65108c9
parent 518bae5fa411327b14ca1e1496f6c9836da0eccd

Added null check in appendSettingToCursor

Added check for null setting before adding to MatrixCursor.

Bug: b/27908871
Change-Id: I0b71c3d5347cad705b8def98fda7e9e463c295e2

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