commit 47b5031c703dbee491af9f49e6e08865452d57ef
author Daniel Sandler <dsandler@android.com> Thu Jul 25 13:16:14 2013 -0400
committer Daniel Sandler <dsandler@android.com> Thu Jul 25 13:16:14 2013 -0400
tree fa5f28acd3f5fd60af6ebc88f64d6d1f3f083d6b
parent 6ad0e7dcaeef394cc1c28294dde309da69233412

Fix NPE on failed loader queries.

Bug: 9901236
Change-Id: I3139174dd03ac3e79960f03729b7a39528804d76

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 28530e6..eaa2fd2 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -1728,7 +1728,9 @@
                         }
                     }
                 } finally {
-                    c.close();
+                    if (c != null) {
+                        c.close();
+                    }
                 }
 
                 if (itemsToRemove.size() > 0) {