diff options
| author | Fyodor Kupolov <fkupolov@google.com> | 2015-06-11 22:41:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-11 22:41:34 +0000 |
| commit | 9c5f1c334b8507af952fc778a0e8e82e7cc59aab (patch) | |
| tree | dd6859ad07396759ed26b09acc2511be1e4867f8 /packages/SettingsProvider | |
| parent | 879e12a14ac2bb756a3548c67ff4145a9b1aeedf (diff) | |
| parent | 421eaa7813e33ea1bbce398e5940e6ab477c759d (diff) | |
| download | frameworks_base-9c5f1c334b8507af952fc778a0e8e82e7cc59aab.zip frameworks_base-9c5f1c334b8507af952fc778a0e8e82e7cc59aab.tar.gz frameworks_base-9c5f1c334b8507af952fc778a0e8e82e7cc59aab.tar.bz2 | |
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
Diffstat (limited to 'packages/SettingsProvider')
| -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; } |