diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-05-12 13:30:07 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2015-05-12 13:31:19 -0700 |
| commit | f044bb1edd8670fbc2cf9eeb1a51c31b91f0889c (patch) | |
| tree | a54dc5a6f56a930a8eb254c5d38741ffb65b72b4 /src/com/android/launcher3/Launcher.java | |
| parent | f6d7f4f21c4d3efa08084d3caaa1a19660ca5777 (diff) | |
| download | android_packages_apps_Trebuchet-f044bb1edd8670fbc2cf9eeb1a51c31b91f0889c.tar.gz android_packages_apps_Trebuchet-f044bb1edd8670fbc2cf9eeb1a51c31b91f0889c.tar.bz2 android_packages_apps_Trebuchet-f044bb1edd8670fbc2cf9eeb1a51c31b91f0889c.zip | |
Preventing NullPointerException when cancelling a shortcut addition
Bug: 21024018
Change-Id: Iac09d9e4f1411aa9fe1ec89fbfe749b009c7d457
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index a289fce87..8603a35df 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1377,7 +1377,9 @@ public class Launcher extends Activity mPendingAddInfo.spanY = savedState.getInt(RUNTIME_STATE_PENDING_ADD_SPAN_Y); AppWidgetProviderInfo info = savedState.getParcelable( RUNTIME_STATE_PENDING_ADD_WIDGET_INFO); - mPendingAddWidgetInfo = LauncherAppWidgetProviderInfo.fromProviderInfo(this, info); + mPendingAddWidgetInfo = info == null ? + null : LauncherAppWidgetProviderInfo.fromProviderInfo(this, info); + mPendingAddWidgetId = savedState.getInt(RUNTIME_STATE_PENDING_ADD_WIDGET_ID); setWaitingForResult(true); mRestoring = true; |