diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-11-04 17:57:36 -0800 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2013-11-04 17:58:15 -0800 |
| commit | f0129b13d1edac399c02dbd93f574a7e3f873525 (patch) | |
| tree | 129cecc7ea7a1e443c91dc4bc0c6e90ae4aa9203 /src | |
| parent | cae7f573de57a13972a6a215484356f6b4779382 (diff) | |
| download | android_packages_apps_Trebuchet-f0129b13d1edac399c02dbd93f574a7e3f873525.tar.gz android_packages_apps_Trebuchet-f0129b13d1edac399c02dbd93f574a7e3f873525.tar.bz2 android_packages_apps_Trebuchet-f0129b13d1edac399c02dbd93f574a7e3f873525.zip | |
Fix bug where cancelling config activity leaves user stuck in bad state
Change-Id: I774cc6e46006f623c97812c85023b228128430fe
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index f721571c2..7b102b48f 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -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; |