Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f044bb1e authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Preventing NullPointerException when cancelling a shortcut addition 

Bug: 21024018
Change-Id: Iac09d9e4f1411aa9fe1ec89fbfe749b009c7d457
parent f6d7f4f2

src/com/android/launcher3/Launcher.java

+3 −1
Original line number Diff line number Diff line
@@ -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;