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 'f52d5de90507bad7cf1bc35acb9862ea314f03d8':
  Fix bug where cancelling config activity leaves user stuck in bad state
This commit is contained in:
Adam Cohen authored and Android Git Automerger committed 2014-02-14 20:37:32 +00:00
commit 5fb0a60d55
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;