summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2013-07-25 13:16:14 -0400
committerDaniel Sandler <dsandler@android.com>2013-07-25 13:16:14 -0400
commit47b5031c703dbee491af9f49e6e08865452d57ef (patch)
treefa5f28acd3f5fd60af6ebc88f64d6d1f3f083d6b /src/com
parent6ad0e7dcaeef394cc1c28294dde309da69233412 (diff)
downloadandroid_packages_apps_Trebuchet-47b5031c703dbee491af9f49e6e08865452d57ef.tar.gz
android_packages_apps_Trebuchet-47b5031c703dbee491af9f49e6e08865452d57ef.tar.bz2
android_packages_apps_Trebuchet-47b5031c703dbee491af9f49e6e08865452d57ef.zip
Fix NPE on failed loader queries.
Bug: 9901236 Change-Id: I3139174dd03ac3e79960f03729b7a39528804d76
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/launcher3/LauncherModel.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 28530e6ac..eaa2fd297 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -1728,7 +1728,9 @@ public class LauncherModel extends BroadcastReceiver {
}
}
} finally {
- c.close();
+ if (c != null) {
+ c.close();
+ }
}
if (itemsToRemove.size() > 0) {