summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShubang <shubang@google.com>2018-02-28 13:56:06 -0800
committerHelen Parsons <helenparsons@google.com>2018-03-01 17:41:44 +0000
commit9568e47fca356983797e67cd662f8c080ef50362 (patch)
tree7e996cece54d0045ae6d13c1ee5851bfdd1b20ff
parentfc137b105fb1e63df0099103e0e5e07fe7d8e329 (diff)
downloadTvProvider-9568e47fca356983797e67cd662f8c080ef50362.tar.gz
Fix IllegalStateException caused by DB closed
DB is closed because it's declared inside a try-with-resources statement Bug: 65493806 Test: make -j30 Change-Id: Ic7536f3488d8a501be72d7613f48002db9e90ae0 (cherry picked from commit ef1b7df26c118dfcd3d6fd63429635a4cc419d87)
-rw-r--r--src/com/android/providers/tv/TvProvider.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/providers/tv/TvProvider.java b/src/com/android/providers/tv/TvProvider.java
index 4a38f94..e8543a2 100644
--- a/src/com/android/providers/tv/TvProvider.java
+++ b/src/com/android/providers/tv/TvProvider.java
@@ -1166,7 +1166,8 @@ public class TvProvider extends ContentProvider {
default:
return null;
}
- try (SQLiteDatabase db = mOpenHelper.getWritableDatabase()) {
+ SQLiteDatabase db = mOpenHelper.getWritableDatabase();
+ try {
db.execSQL("ALTER TABLE " + tableName + " ADD "
+ columnName + " " + dataType + defaultValue + ";");
projectionMap.put(columnName.toString(), tableName + '.' + columnName);
@@ -1588,7 +1589,7 @@ public class TvProvider extends ContentProvider {
private static void updateProjectionMap(SQLiteDatabase db, String tableName,
Map<String, String> projectionMap) {
- try(Cursor cursor = db.rawQuery("SELECT * FROM " + tableName + " LIMIT 0", null)) {
+ try (Cursor cursor = db.rawQuery("SELECT * FROM " + tableName + " LIMIT 0", null)) {
for (String columnName : cursor.getColumnNames()) {
if (!projectionMap.containsKey(columnName)) {
projectionMap.put(columnName, tableName + '.' + columnName);