commit 421eaa7813e33ea1bbce398e5940e6ab477c759d
author Fyodor Kupolov <fkupolov@google.com> Thu Jun 11 22:29:20 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 11 22:29:21 2015 +0000
tree 838ff0033a17580360d69bb3db3521f26a71f798
parent dcb9e169d7b37d62112c25c65da54c2b92651f9f
parent 1f450dbfbc60512e66733d1b95dad5237c997155

Merge "Fixed NPE when dumpSettings is called with a null cursor" into mnc-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 1dba942e..5137e1b 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -516,7 +516,7 @@
     }
 
     private void dumpSettings(Cursor cursor, PrintWriter pw) {
-        if (!cursor.moveToFirst()) {
+        if (cursor == null || !cursor.moveToFirst()) {
             return;
         }