From 1f450dbfbc60512e66733d1b95dad5237c997155 Mon Sep 17 00:00:00 2001
From: Fyodor Kupolov <fkupolov@google.com>
Date: Thu, 11 Jun 2015 15:25:59 -0700
Subject: Fixed NPE when dumpSettings is called with a null cursor

Bug: 20070414
Change-Id: I15d5d2ae27a7892807221421778082e0f29a36ff
---
 .../src/com/android/providers/settings/SettingsProvider.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/SettingsProvider')

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;
         }
 
-- 
cgit v1.1