summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2010-05-07 10:57:56 -0700
committerThe Android Automerger <android-build@android.com>2010-05-07 10:57:56 -0700
commit3108f413caf73990ee1a4b8297c3d3d93e6ba8f5 (patch)
tree1e44b4e9a77399891cc6b198ac819d075e7061df
parent8178101f1f8d05eb72bcd7da933e0b26280e36a3 (diff)
parente1cc6c3745c9ba721b6ab888d74c9d9e1d13ea6a (diff)
downloadandroid_packages_apps_Trebuchet-3108f413caf73990ee1a4b8297c3d3d93e6ba8f5.tar.gz
android_packages_apps_Trebuchet-3108f413caf73990ee1a4b8297c3d3d93e6ba8f5.tar.bz2
android_packages_apps_Trebuchet-3108f413caf73990ee1a4b8297c3d3d93e6ba8f5.zip
Merge branch 'froyo' into froyo-release
-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