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

Commit abd3e985 authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by android-build-merger
Browse files

Merge "Prevent NPE in startActivityUnchecked" into oc-dev am: 45a5adad

am: 2820e212

Change-Id: Id6783edf74bf3f254b80ee99af14d0ebb695cb5b
parents a30b2bf1 2820e212
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1059,7 +1059,7 @@ 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();
                if (outActivity.length > 0) {
                if (outActivity != null && outActivity.length > 0) {
                    outActivity[0] = reusedActivity;
                }
                return START_TASK_TO_FRONT;