summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2013-03-20 11:57:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-20 11:57:53 +0000
commitc6b097a06775cfcb7defcaefbea424b9651ababb (patch)
treed66ce5a2234839de7f58d7d3611f3e4c209e0aa6
parentcc0ec1f9705211bd730502876c47bd7dcc9ba66b (diff)
parent463539424d03ecd2f2a7470bb24f4826b03a80ab (diff)
downloadandroid_packages_apps_Trebuchet-c6b097a06775cfcb7defcaefbea424b9651ababb.tar.gz
android_packages_apps_Trebuchet-c6b097a06775cfcb7defcaefbea424b9651ababb.tar.bz2
android_packages_apps_Trebuchet-c6b097a06775cfcb7defcaefbea424b9651ababb.zip
am 46353942: am b8f5c401: Don\'t close widget preview cache db
* commit '463539424d03ecd2f2a7470bb24f4826b03a80ab': Don't close widget preview cache db
-rw-r--r--src/com/android/launcher2/AppsCustomizePagedView.java3
-rw-r--r--src/com/android/launcher2/WidgetPreviewLoader.java7
2 files changed, 0 insertions, 10 deletions
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java
index ed834b9c8..83bc1fd40 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 5ce323377..41a8904a4 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 " +