diff options
| author | Fyodor Kupolov <fkupolov@google.com> | 2015-06-11 22:29:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-11 22:29:21 +0000 |
| commit | 421eaa7813e33ea1bbce398e5940e6ab477c759d (patch) | |
| tree | 838ff0033a17580360d69bb3db3521f26a71f798 /packages | |
| parent | dcb9e169d7b37d62112c25c65da54c2b92651f9f (diff) | |
| parent | 1f450dbfbc60512e66733d1b95dad5237c997155 (diff) | |
| download | frameworks_base-421eaa7813e33ea1bbce398e5940e6ab477c759d.zip frameworks_base-421eaa7813e33ea1bbce398e5940e6ab477c759d.tar.gz frameworks_base-421eaa7813e33ea1bbce398e5940e6ab477c759d.tar.bz2 | |
Merge "Fixed NPE when dumpSettings is called with a null cursor" into mnc-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 1dba942..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 @@ public class SettingsProvider extends ContentProvider { } private void dumpSettings(Cursor cursor, PrintWriter pw) { - if (!cursor.moveToFirst()) { + if (cursor == null || !cursor.moveToFirst()) { return; } |