drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "frameworks/base: Handle null from topRunningNonDelayedActivityLocked"

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2010-10-25 15:32:12 -07:00
committed by Android Code Review
parent 9084631dba d6499dc69f
commit b4ae2f1ba4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/am/ActivityManagerService.java
View File

@ -3410,7 +3410,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
// being started, which means not bringing it to the front
// if the caller is not itself in the front.
HistoryRecord 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;