commit f0129b13d1edac399c02dbd93f574a7e3f873525
author Adam Cohen <adamcohen@google.com> Mon Nov 04 17:57:36 2013 -0800
committer Adam Cohen <adamcohen@google.com> Mon Nov 04 17:58:15 2013 -0800
tree 129cecc7ea7a1e443c91dc4bc0c6e90ae4aa9203
parent cae7f573de57a13972a6a215484356f6b4779382

Fix bug where cancelling config activity leaves user stuck in bad state

Change-Id: I774cc6e46006f623c97812c85023b228128430fe

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index f721571..7b102b4 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -741,7 +741,7 @@
                     data.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, -1) : -1;
             final int result;
             final Runnable onComplete;
-            if (appWidgetId < 0) {
+            if (appWidgetId < 0 || resultCode == RESULT_CANCELED) {
                 Log.e(TAG, "Error: appWidgetId (EXTRA_APPWIDGET_ID) was not returned from the \\" +
                         "widget configuration activity.");
                 result = RESULT_CANCELED;