| commit | 9c5f1c334b8507af952fc778a0e8e82e7cc59aab | [log] [tgz] |
|---|---|---|
| author | Fyodor Kupolov <fkupolov@google.com> | Thu Jun 11 22:41:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 11 22:41:34 2015 +0000 |
| tree | dd6859ad07396759ed26b09acc2511be1e4867f8 | |
| parent | 879e12a14ac2bb756a3548c67ff4145a9b1aeedf [diff] | |
| parent | 421eaa7813e33ea1bbce398e5940e6ab477c759d [diff] |
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
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; }