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

Commit 45a5adad authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by Android (Google) Code Review
Browse files

Merge "Prevent NPE in startActivityUnchecked" into oc-dev

parents 94324280 625f4936

services/core/java/com/android/server/am/ActivityStarter.java

+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;