Snap for 4628106 from ef1b7df26c118dfcd3d6fd63429635a4cc419d87 to pi-release

Change-Id: If5aa252fdd49e8290e5841c5ca8806fbd43b9f2f

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 6968196..01bc833 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);