Fix for bug 5090755 StrictMode violation BrowserProvider2 - Cursor not closed

Closing all cursors in the file that were not closed.

Change-Id: I0dd3f4d438d1cb8390ac297322ee38d0afd50fea

1 files changed, 8 insertions, 3 deletions

diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java
index fe7a31b..1328040 100644
--- a/src/com/android/browser/provider/BrowserProvider2.java
+++ b/src/com/android/browser/provider/BrowserProvider2.java
@@ -1227,6 +1227,7 @@ public class BrowserProvider2 extends SQLiteContentProvider {
                                 new String[] { Long.toString(id) });
                     }
                 }
+                c.close();
                 break;
             }
             case THUMBNAILS_ID: {
@@ -1259,8 +1260,12 @@ public class BrowserProvider2 extends SQLiteContentProvider {
                     " AND account_type = ? AND account_name = ?",
                     new String[] { ChromeSyncColumns.FOLDER_NAME_BOOKMARKS_BAR,
                     accountType, accountName }, null, null, null);
-            if (c.moveToFirst()) {
-                return c.getLong(0);
+            try {
+                if (c.moveToFirst()) {
+                    return c.getLong(0);
+                }
+            } finally {
+                c.close();
             }
         }
         return FIXED_ID_ROOT;
@@ -1737,8 +1742,8 @@ public class BrowserProvider2 extends SQLiteContentProvider {
             if (c.moveToFirst()) {
                 parentAccountName = c.getString(0);
                 parentAccountType = c.getString(1);
-                c.close();
             }
+            c.close();
         } else if (values.containsKey(Bookmarks.ACCOUNT_NAME)
                 || values.containsKey(Bookmarks.ACCOUNT_TYPE)) {
             // TODO: Implement if needed (no one needs this yet)