commit eb23cb2a90a7f1fa794a375b9d7a111d7f630a02
author Winson Chung <winsonc@google.com> Thu Mar 06 10:39:43 2014 -0800
committer Winson Chung <winsonc@google.com> Thu Mar 06 18:41:51 2014 +0000
tree 2df27af8c4eeec1d12effb874962587fdfec2476
parent 706ab0d07ada1694de78c573e342f4c64d75d45c

Properly releasing ContentProviderClient after LauncherModel check.

Change-Id: I0823ada46661b5ba0c36a0bb9f792969a1d04561

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 007fd7a..5f8f80c 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -191,8 +191,12 @@
         ContentResolver contentResolver = context.getContentResolver();
 
         mAppsCanBeOnRemoveableStorage = Environment.isExternalStorageRemovable();
-        mOldContentProviderExists = (contentResolver.acquireContentProviderClient(
-                LauncherSettings.Favorites.OLD_CONTENT_URI) != null);
+        ContentProviderClient client = contentResolver.acquireContentProviderClient(
+                LauncherSettings.Favorites.OLD_CONTENT_URI);
+        mOldContentProviderExists = (client != null);
+        if (client != null) {
+            client.release();
+        }
         mApp = app;
         mBgAllAppsList = new AllAppsList(iconCache, appFilter);
         mIconCache = iconCache;