Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: b020279

* commit 'b0202799528fe70a045224b1151c1720ef224aa8':
  Added null check in appendSettingToCursor

Change-Id: Iaf678dd04e6ee911452fd70319fc458ba39673cf
This commit is contained in:
Suprabh Shukla
2016-04-13 03:17:22 +00:00
committed by android-build-merger
parent dc4ebd15ab b020279952
commit 6e4fec33d0
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -1324,6 +1324,9 @@ public class SettingsProvider extends ContentProvider {
} }
private static void appendSettingToCursor(MatrixCursor cursor, Setting setting) { private static void appendSettingToCursor(MatrixCursor cursor, Setting setting) {
if (setting == null) {
return;
}
final int columnCount = cursor.getColumnCount(); final int columnCount = cursor.getColumnCount();
String[] values = new String[columnCount]; String[] values = new String[columnCount];