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

Commit 14810c7e authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Fix null pointer exception

- Make sure to use the correct task to get the stack.
- Don't try to show non-resizable toast when we didn't do
anything.

Bug: 27870378
Change-Id: I69fec6aa792c2f05d905a7c99c05ebdc689ad032
parent 9971d02c
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
@@ -947,8 +947,6 @@ class ActivityStarter {
                // We didn't do anything...  but it was needed (a.k.a., client don't use that
                // intent!)  And for paranoia, make sure we have correctly resumed the top activity.
                resumeTargetStackIfNeeded();
                mSupervisor.showNonResizeableDockToastIfNeeded(mStartActivity.task,
                        preferredLaunchStackId, mTargetStack.mStackId);
                return START_TASK_TO_FRONT;
            }
        }
@@ -989,7 +987,7 @@ class ActivityStarter {
            top.deliverNewIntentLocked(
                    mCallingUid, mStartActivity.intent, mStartActivity.launchedFromPackage);
            mSupervisor.showNonResizeableDockToastIfNeeded(mStartActivity.task,
                    preferredLaunchStackId, mTargetStack.mStackId);
                    preferredLaunchStackId, topStack.mStackId);
            return START_DELIVERED_TO_TOP;
        }