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

This commit is contained in:
Adam Cohen authored and Android (Google) Code Review committed 2013-11-05 02:10:37 +00:00
commit c18e4a9265
1 file changed
+1 -1
+1 -1
View File
@@ -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;