Merge "Fix bug where cancelling config activity leaves user stuck in bad state" into jb-ub-now-jetsonic

2013-11-05 02:10:36 +00:00
parent 5c6474da60 f0129b13d1
commit c18e4a9265
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;