summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2013-02-06 13:34:31 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-02-06 13:34:32 +0000
commite4b4cd7a877d8bbfb24585f0fb8dfe7885d2b165 (patch)
tree174531cc7d155b8a0ac9872ac85c1102cf752435 /src/com
parentd9ba96aab40e64ebe30fec12a9a362e5382571b0 (diff)
parent0247d1418dcec03a3522cc24f0eb98cc0734eae0 (diff)
downloadandroid_packages_apps_Trebuchet-e4b4cd7a877d8bbfb24585f0fb8dfe7885d2b165.tar.gz
android_packages_apps_Trebuchet-e4b4cd7a877d8bbfb24585f0fb8dfe7885d2b165.tar.bz2
android_packages_apps_Trebuchet-e4b4cd7a877d8bbfb24585f0fb8dfe7885d2b165.zip
Merge "Clean up database in WidgetPreviewLoader"
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/launcher2/AppsCustomizePagedView.java3
-rw-r--r--src/com/android/launcher2/WidgetPreviewLoader.java6
2 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java
index 55e668964..121afb060 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/android/launcher2/AppsCustomizePagedView.java
@@ -894,6 +894,9 @@ 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 052151cae..a9bc098dc 100644
--- a/src/com/android/launcher2/WidgetPreviewLoader.java
+++ b/src/com/android/launcher2/WidgetPreviewLoader.java
@@ -352,6 +352,12 @@ 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 = WidgetPreviewCacheDb.COLUMN_NAME + " = ? AND " +