diff options
| author | John Reck <jreck@google.com> | 2012-04-20 13:42:46 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-20 13:42:46 -0700 |
| commit | 4dcbf7f74154aa4c5d8d29ce216ccfee83882a9a (patch) | |
| tree | caffcaf0b087073b694b8a60648ad1a282216e47 | |
| parent | b3542b377acb7ec2621d2cbe3ecb9fe50b5a3961 (diff) | |
| parent | 96fd9399bebddf540dbbd174b1f01ca5a10bbc76 (diff) | |
| download | packages_apps_Browser-4dcbf7f74154aa4c5d8d29ce216ccfee83882a9a.tar.gz packages_apps_Browser-4dcbf7f74154aa4c5d8d29ce216ccfee83882a9a.tar.bz2 packages_apps_Browser-4dcbf7f74154aa4c5d8d29ce216ccfee83882a9a.zip | |
Merge "Fix strictmode violation"
| -rw-r--r-- | src/com/android/browser/homepages/RequestHandler.java | 53 |
1 files changed, 28 insertions, 25 deletions
diff --git a/src/com/android/browser/homepages/RequestHandler.java b/src/com/android/browser/homepages/RequestHandler.java index 13b52e3d2..823935efa 100644 --- a/src/com/android/browser/homepages/RequestHandler.java +++ b/src/com/android/browser/homepages/RequestHandler.java @@ -112,34 +112,37 @@ public class RequestHandler extends Thread { History.CONTENT_URI, PROJECTION, SELECTION,
null, History.VISITS + " DESC LIMIT 12");
Cursor cursor = historyResults;
- if (cursor.getCount() < 12) {
- Cursor bookmarkResults = mContext.getContentResolver().query(
- Bookmarks.CONTENT_URI, PROJECTION, SELECTION,
- null, Bookmarks.DATE_CREATED + " DESC LIMIT 12");
- cursor = new MergeCursor(new Cursor[] { historyResults, bookmarkResults }) {
+ try {
+ if (cursor.getCount() < 12) {
+ Cursor bookmarkResults = mContext.getContentResolver().query(
+ Bookmarks.CONTENT_URI, PROJECTION, SELECTION,
+ null, Bookmarks.DATE_CREATED + " DESC LIMIT 12");
+ cursor = new MergeCursor(new Cursor[] { historyResults, bookmarkResults }) {
+ @Override
+ public int getCount() {
+ return Math.min(12, super.getCount());
+ }
+ };
+ }
+ t.assignLoop("most_visited", new Template.CursorListEntityWrapper(cursor) {
@Override
- public int getCount() {
- return Math.min(12, super.getCount());
+ public void writeValue(OutputStream stream, String key) throws IOException {
+ Cursor cursor = getCursor();
+ if (key.equals("url")) {
+ stream.write(htmlEncode(cursor.getString(0)));
+ } else if (key.equals("title")) {
+ stream.write(htmlEncode(cursor.getString(1)));
+ } else if (key.equals("thumbnail")) {
+ stream.write("data:image/png;base64,".getBytes());
+ byte[] thumb = cursor.getBlob(2);
+ stream.write(Base64.encode(thumb, Base64.DEFAULT));
+ }
}
- };
+ });
+ t.write(mOutput);
+ } finally {
+ cursor.close();
}
-
- t.assignLoop("most_visited", new Template.CursorListEntityWrapper(cursor) {
- @Override
- public void writeValue(OutputStream stream, String key) throws IOException {
- Cursor cursor = getCursor();
- if (key.equals("url")) {
- stream.write(htmlEncode(cursor.getString(0)));
- } else if (key.equals("title")) {
- stream.write(htmlEncode(cursor.getString(1)));
- } else if (key.equals("thumbnail")) {
- stream.write("data:image/png;base64,".getBytes());
- byte[] thumb = cursor.getBlob(2);
- stream.write(Base64.encode(thumb, Base64.DEFAULT));
- }
- }
- });
- t.write(mOutput);
}
private static final Comparator<File> sFileComparator = new Comparator<File>() {
|