diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-11-04 17:57:36 -0800 |
|---|---|---|
| committer | Danesh M <daneshm90@gmail.com> | 2014-06-05 23:46:12 -0700 |
| commit | dd21993fc6ed421327888b40e04e38c721d11d60 (patch) | |
| tree | 4d9e4b0792d8b616c893743df342313c23316301 /src/com/android/launcher3/Launcher.java | |
| parent | 63455c0128a05ab3a9b101418e5bd5c14e6da6ec (diff) | |
| download | android_packages_apps_Trebuchet-dd21993fc6ed421327888b40e04e38c721d11d60.tar.gz android_packages_apps_Trebuchet-dd21993fc6ed421327888b40e04e38c721d11d60.tar.bz2 android_packages_apps_Trebuchet-dd21993fc6ed421327888b40e04e38c721d11d60.zip | |
Fix bug where cancelling config activity leaves user stuck in bad state
Change-Id: I774cc6e46006f623c97812c85023b228128430fe
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
| -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 d2d6694d7..70434a90c 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -777,7 +777,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; |