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
2014-02-14 20:53:01 +00:00
parent 7bcf2eaff6 5fb0a60d55
commit dc90f62fa6
1 changed files with 1 additions and 1 deletions
@@ -741,7 +741,7 @@ public class Launcher extends Activity
                    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;