diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-25 15:32:12 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-10-25 15:32:12 -0700 |
| commit | b4ae2f1ba419212224d53db81c46ad242bebd17b (patch) | |
| tree | ddc003daed36cc0fa0e0b3c92061999b5c64f5bb | |
| parent | 9084631dba8938942ddd8d4cb1e0f9149965ae8e (diff) | |
| parent | d6499dc69fd54d3ec735e267410f832c302acc97 (diff) | |
| download | frameworks_base-b4ae2f1ba419212224d53db81c46ad242bebd17b.zip frameworks_base-b4ae2f1ba419212224d53db81c46ad242bebd17b.tar.gz frameworks_base-b4ae2f1ba419212224d53db81c46ad242bebd17b.tar.bz2 | |
Merge "frameworks/base: Handle null from topRunningNonDelayedActivityLocked"
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index f5a8119..51ff959 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -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; |