diff options
| author | Winson Chung <winsonc@google.com> | 2012-04-27 15:24:02 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2012-04-27 15:25:38 -0700 |
| commit | 5aaab774cfb83833197dac553d4a6eb769032146 (patch) | |
| tree | 83ecafa3b727974e443538c34119a1396ee15019 | |
| parent | 727f0e1292dccc1916c7e3d54ff70385ae329108 (diff) | |
| download | android_packages_apps_Trebuchet-5aaab774cfb83833197dac553d4a6eb769032146.tar.gz android_packages_apps_Trebuchet-5aaab774cfb83833197dac553d4a6eb769032146.tar.bz2 android_packages_apps_Trebuchet-5aaab774cfb83833197dac553d4a6eb769032146.zip | |
Logging error when we do not get a valid appWidgetId back from the configuration widget. (Bug 6407704)
Change-Id: Ib58b9f43b63edb211059728f7b65560704295c76
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index e5c62add7..fb27d02e8 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -568,7 +568,13 @@ public final class Launcher extends Activity if (isWidgetDrop) { int appWidgetId = data != null ? data.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, -1) : -1; - completeTwoStageWidgetDrop(resultCode, appWidgetId); + if (appWidgetId < 0) { + Log.e(TAG, "Error: appWidgetId (EXTRA_APPWIDGET_ID) was not returned from the \\" + + "widget configuration activity."); + completeTwoStageWidgetDrop(RESULT_CANCELED, appWidgetId); + } else { + completeTwoStageWidgetDrop(resultCode, appWidgetId); + } return; } |