Merge "Fix exception when getting grid title" into main (75996f18) · Commits · e / os / android_packages_apps_ThemePicker

src/com/android/customization/model/grid/DefaultShapeGridManager.kt

+44 −25

Original line number	Diff line number	Diff line
		@@ -53,15 +53,27 @@ constructor(
		?.use { cursor ->
		buildList {
		while (cursor.moveToNext()) {
		try {
		val rows = cursor.getInt(cursor.getColumnIndex(COL_ROWS))
		val cols = cursor.getInt(cursor.getColumnIndex(COL_COLS))
		val title =
		cursor.getString(cursor.getColumnIndex(COL_GRID_TITLE))
		?: context.getString(
		val backUpTitle =
		context.getString(
		com.android.themepicker.R.string.grid_title_pattern,
		cols,
		rows,
		)
		val title =
		cursor.getColumnIndex(COL_GRID_TITLE).let { titleIndex
		->
		if (titleIndex != -1) {
		// Note that title can be null, even when the
		// column field exists.
		cursor.getString(titleIndex)
		} else {
		null
		}
		} ?: backUpTitle

		add(
		GridOptionModel(
		key =
		@@ -83,6 +95,13 @@ constructor(
		),
		)
		)
		} catch (e: IllegalStateException) {
		Log.e(
		TAG,
		"Fail to read from the cursor to build GridOptionModel",
		e,
		)
		}
		}
		}
		.let { list ->