am 421eaa78: Merge "Fixed NPE when dumpSettings is called with a null cursor" into mnc-dev

* commit '421eaa7813e33ea1bbce398e5940e6ab477c759d': Fixed NPE when dumpSettings is called with a null cursor
2015-06-11 22:41:34 +00:00
parent 879e12a14a 421eaa7813
commit 9c5f1c334b
1 changed files with 1 additions and 1 deletions
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -516,7 +516,7 @@ public class SettingsProvider extends ContentProvider {
    }

    private void dumpSettings(Cursor cursor, PrintWriter pw) {
-        if (!cursor.moveToFirst()) {
+        if (cursor == null || !cursor.moveToFirst()) {
            return;
        }