Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 421eaa78 authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by Android (Google) Code Review
Browse files

Merge "Fixed NPE when dumpSettings is called with a null cursor" into mnc-dev

parents dcb9e169 1f450dbf

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

        }