Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b2dd4e87: am 1a907db0: am 862c3835: am 4b60a8d1: Merge "Added check of ActivityInfo launch mode when starting activity."

Browse Source 
* commit 'b2dd4e87ae8ac6a0402b7a0ed37201f27bcb1b9c':
  Added check of ActivityInfo launch mode when starting activity.
This commit is contained in:
Dianne Hackborn
2012-08-30 16:07:26 -07:00
committed by Android Git Automerger
parent 3dd72c6db6 b2dd4e87ae
commit f44444120b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/am/ActivityStack.java
View File

@@ -2776,7 +2776,8 @@ final class ActivityStack {
// If the top activity in the task is the root
// activity, deliver this new intent to it if it
// desires.
if ((launchFlags&Intent.FLAG_ACTIVITY_SINGLE_TOP) != 0
if (((launchFlags&Intent.FLAG_ACTIVITY_SINGLE_TOP) != 0
|| r.launchMode == ActivityInfo.LAUNCH_SINGLE_TOP)
&& taskTop.realActivity.equals(r.realActivity)) {
logStartActivity(EventLogTags.AM_NEW_INTENT, r, taskTop.task);
if (taskTop.frontOfTask) {