From eb23cb2a90a7f1fa794a375b9d7a111d7f630a02 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 6 Mar 2014 10:39:43 -0800
Subject: Properly releasing ContentProviderClient after LauncherModel check.

Change-Id: I0823ada46661b5ba0c36a0bb9f792969a1d04561
---
 src/com/android/launcher3/LauncherModel.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/com/android/launcher3/LauncherModel.java')

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 007fd7a4a..5f8f80cea 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -191,8 +191,12 @@ public class LauncherModel extends BroadcastReceiver {
         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;
-- 
cgit v1.2.3