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

* commit '9c5f1c334b8507af952fc778a0e8e82e7cc59aab': Fixed NPE when dumpSettings is called with a null cursor
2015-06-11 22:53:59 +00:00
parent 35b387f360 9c5f1c334b
commit 57cced9462
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;
        }