Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c18e4a92 authored by Adam Cohen's avatar Adam Cohen Committed by Android (Google) Code Review
Browse files

Merge "Fix bug where cancelling config activity leaves user stuck in bad... 

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

src/com/android/launcher3/Launcher.java

+1 −1
Original line number Diff line number Diff line
@@ -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;