summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2010-05-07 10:53:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-07 10:53:11 -0700
commitcfb390545f77ab59b1485e91dd21946742e37843 (patch)
tree8a2438cc90899dfbf4733eb76dd23fa000e57251 /src
parent8be8b9713036549399a5a39e58974c9345b9aff4 (diff)
parente1cc6c3745c9ba721b6ab888d74c9d9e1d13ea6a (diff)
downloadandroid_packages_apps_Trebuchet-cfb390545f77ab59b1485e91dd21946742e37843.tar.gz
android_packages_apps_Trebuchet-cfb390545f77ab59b1485e91dd21946742e37843.tar.bz2
android_packages_apps_Trebuchet-cfb390545f77ab59b1485e91dd21946742e37843.zip
am e1cc6c37: Fix 2617318 - NPE in Launcher2.
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Workspace.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 0a658a47a..f65d956f0 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -1403,7 +1403,7 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag
final LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) tag;
final AppWidgetProviderInfo provider =
widgets.getAppWidgetInfo(info.appWidgetId);
- if (provider == null) {
+ if (provider != null) {
for (String packageName: packageNames) {
if (packageName.equals(provider.provider.getPackageName())) {
// TODO: This should probably be done on a worker thread