commit 33941668f6ed82fa8b0ea0b7ac3c21d7d911c1c1
author Winson Chung <winsonc@google.com> Fri Apr 27 15:49:22 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 27 15:49:22 2012 -0700
tree 1aae456c6292092b2f7c7c4cac113fd2b8348b72
parent 5aaab774cfb83833197dac553d4a6eb769032146
parent ac08f4b93e075fd90c8689509ad3108284a717d8

Merge "Fixing issue where you can not swipe AllApps while transitioning to AllApps. (Bug 6389985)" into jb-dev

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index e5c62ad..fb27d02 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -568,7 +568,13 @@
         if (isWidgetDrop) {
             int appWidgetId = data != null ?
                     data.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, -1) : -1;
-            completeTwoStageWidgetDrop(resultCode, appWidgetId);
+            if (appWidgetId < 0) {
+                Log.e(TAG, "Error: appWidgetId (EXTRA_APPWIDGET_ID) was not returned from the \\" +
+                        "widget configuration activity.");
+                completeTwoStageWidgetDrop(RESULT_CANCELED, appWidgetId);
+            } else {
+                completeTwoStageWidgetDrop(resultCode, appWidgetId);
+            }
             return;
         }