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

Commit 6e4fec33 authored by Suprabh Shukla's avatar Suprabh Shukla Committed by android-build-merger
Browse files

Merge "Added null check in appendSettingToCursor" into nyc-dev 

am: b0202799

* commit 'b0202799':
  Added null check in appendSettingToCursor

Change-Id: Iaf678dd04e6ee911452fd70319fc458ba39673cf
parents dc4ebd15 b0202799

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

+3 −0
Original line number Diff line number Diff line
@@ -1324,6 +1324,9 @@ public class SettingsProvider extends ContentProvider { 
    }



    private static void appendSettingToCursor(MatrixCursor cursor, Setting setting) {

        if (setting == null) {

            return;

        }

        final int columnCount = cursor.getColumnCount();



        String[] values =  new String[columnCount];