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

Commit 33c42474 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 55744530: Merge "resolved conflicts for merge of b4ae2f1b to... 

am 55744530: Merge "resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp" into gingerbread-plus-aosp

Merge commit '55744530'

* commit '55744530':
  frameworks/base: Handle null from topRunningNonDelayedActivityLocked
parents cd44bf9c 55744530

services/java/com/android/server/am/ActivityStack.java

+1 −1
Original line number Diff line number Diff line
@@ -2139,7 +2139,7 @@ public class ActivityStack { 
                    // being started, which means not bringing it to the front

                    // if the caller is not itself in the front.

                    ActivityRecord curTop = topRunningNonDelayedActivityLocked(notTop);

                    if (curTop.task != taskTop.task) {

                    if (curTop != null && curTop.task != taskTop.task) {

                        r.intent.addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);

                        boolean callerAtFront = sourceRecord == null

                                || curTop.task == sourceRecord.task;