commit dc90f62fa6cb91e5abe19f69a031399326e11068
author Adam Cohen <adamcohen@google.com> Fri Feb 14 20:53:01 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:53:01 2014 +0000
tree dbdb54615734826d04a39df415fd29e667708ded
parent 7bcf2eaff665ccb55f3ab260f6967cb5a6c9511f
parent 5fb0a60d55526cf8426f81d60229af56b1a54fb3

am 5fb0a60d: am f52d5de9: am d120e994: am c18e4a92: Merge "Fix bug where cancelling config activity leaves user stuck in bad state" into jb-ub-now-jetsonic

* commit '5fb0a60d55526cf8426f81d60229af56b1a54fb3':
  Fix bug where cancelling config activity leaves user stuck in bad state

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 5952415..a1cfff7 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;