From b8f5c401de0a081557d8c014c0ecf00264d5f266 Mon Sep 17 00:00:00 2001 From: Michael Jurka Date: Wed, 20 Mar 2013 12:51:36 +0100 Subject: [PATCH] Don't close widget preview cache db Only one connection is ever held now, and that will be closed when the app is killed --- src/com/android/launcher2/AppsCustomizePagedView.java | 3 --- src/com/android/launcher2/WidgetPreviewLoader.java | 7 ------- 2 files changed, 10 deletions(-) diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index ed834b9c89..83bc1fd40e 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -894,9 +894,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen protected void onDetachedFromWindow() { super.onDetachedFromWindow(); cancelAllTasks(); - if (mWidgetPreviewLoader != null) { - mWidgetPreviewLoader.closeDb(); - } } public void clearAllWidgetPages() { diff --git a/src/com/android/launcher2/WidgetPreviewLoader.java b/src/com/android/launcher2/WidgetPreviewLoader.java index 5ce3233779..41a8904a41 100644 --- a/src/com/android/launcher2/WidgetPreviewLoader.java +++ b/src/com/android/launcher2/WidgetPreviewLoader.java @@ -348,7 +348,6 @@ public class WidgetPreviewLoader { WIDGET_PREFIX + packageName + "/%", SHORTCUT_PREFIX + packageName + "/%"} // args to SELECT query ); - db.close(); synchronized(sInvalidPackages) { sInvalidPackages.remove(packageName); } @@ -357,12 +356,6 @@ public class WidgetPreviewLoader { }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null); } - public void closeDb() { - if (mDb != null) { - mDb.close(); - } - } - private Bitmap readFromDb(String name, Bitmap b) { if (mCachedSelectQuery == null) { mCachedSelectQuery = CacheDb.COLUMN_NAME + " = ? AND " +