From f044bb1edd8670fbc2cf9eeb1a51c31b91f0889c Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Tue, 12 May 2015 13:30:07 -0700 Subject: Preventing NullPointerException when cancelling a shortcut addition Bug: 21024018 Change-Id: Iac09d9e4f1411aa9fe1ec89fbfe749b009c7d457 --- src/com/android/launcher3/Launcher.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/com/android/launcher3/Launcher.java') 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; -- cgit v1.2.3