diff options
| author | Fyodor Kupolov <fkupolov@google.com> | 2015-06-11 15:25:59 -0700 |
|---|---|---|
| committer | Fyodor Kupolov <fkupolov@google.com> | 2015-06-11 15:25:59 -0700 |
| commit | 1f450dbfbc60512e66733d1b95dad5237c997155 (patch) | |
| tree | aef7769046192a89142ab6b14c5e2a01998262fd /packages | |
| parent | b3c134e1614e02471811a43d12bedcfc5778667b (diff) | |
| download | frameworks_base-1f450dbfbc60512e66733d1b95dad5237c997155.zip frameworks_base-1f450dbfbc60512e66733d1b95dad5237c997155.tar.gz frameworks_base-1f450dbfbc60512e66733d1b95dad5237c997155.tar.bz2 | |
Fixed NPE when dumpSettings is called with a null cursor
Bug: 20070414
Change-Id: I15d5d2ae27a7892807221421778082e0f29a36ff
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; } |