commit d92922c4011b22f82ca0f69437169cf4599c51e3
author Ben Murdoch <benm@google.com> Thu Jul 28 11:24:15 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 28 11:24:15 2011 -0700
tree f96023f3ef7c8eca21ae59c90abf51141d95735c
parent fc49252cdafd9c358b9b15fb0dcb973f09c8eb07
parent b98cb5187fcb3034ee3675de791fd811d76d1593

Merge "Fix Strict Mode violation in SnapshotProvider."

src/com/android/browser/provider/BrowserProvider2.java

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 @@
                                 new String[] { Long.toString(id) });
                     }
                 }
+                c.close();
                 break;
             }
             case THUMBNAILS_ID: {
@@ -1259,8 +1260,12 @@
                     " 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 @@
             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)