commit 98baae654dc6e69eecb5ffab2f86c5ab217a762c
author The Android Open Source Project <initial-contribution@android.com> Fri Feb 13 12:57:53 2009 -0800
committer The Android Open Source Project <initial-contribution@android.com> Fri Feb 13 12:57:53 2009 -0800
tree c949cee572fe7424493e7b54247ce8462813f361
parent 15a8880cb1b9010ce4503c10c1666568d49415b1

auto import from //branches/cupcake/...@131421

src/com/android/launcher/LiveFolderAdapter.java

diff --git a/src/com/android/launcher/LiveFolderAdapter.java b/src/com/android/launcher/LiveFolderAdapter.java
index 01db5a6..71ed85d 100644
--- a/src/com/android/launcher/LiveFolderAdapter.java
+++ b/src/com/android/launcher/LiveFolderAdapter.java
@@ -178,10 +178,13 @@
         }
         mCustomIcons.clear();
 
-        try {
-            getCursor().close();
-        } finally {
-            mLauncher.stopManagingCursor(getCursor());
+        final Cursor cursor = getCursor();
+        if (cursor != null) {
+            try {
+                cursor.close();
+            } finally {
+                mLauncher.stopManagingCursor(cursor);
+            }
         }
     }