commit 22e58442147be394c672c703dc5636cd6a6629dc
author Winson Chung <winsonc@google.com> Thu Mar 06 19:48:29 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 06 19:48:29 2014 +0000
tree 2df27af8c4eeec1d12effb874962587fdfec2476
parent 6c2672925ba893838768a51ed379d0605e00139b
parent eb23cb2a90a7f1fa794a375b9d7a111d7f630a02

am eb23cb2a: Properly releasing ContentProviderClient after LauncherModel check.

* commit 'eb23cb2a90a7f1fa794a375b9d7a111d7f630a02':
  Properly releasing ContentProviderClient after LauncherModel check.

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;