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

Merge "Merge "Handle trampoline activites in different tasks" into nyc-dev am: 0d35765ca3 am: 03d0a3aeff" into nyc-mr1-dev-plus-aosp

Browse Source 
am: 3b5aac257b

* commit '3b5aac257bd9092de4c552ac095d5cbf7109a9b7':
  Handle trampoline activites in different tasks

Change-Id: I369dc499ac8edadf3a3ec0fe3bfce23753331268
This commit is contained in:
Jorim Jaggi
2016-05-27 22:02:42 +00:00
committed by android-build-merger
parent bae9b4901a 3b5aac257b
commit 70d7b0aa84
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/am/ActivityStarter.java
View File

@@ -558,7 +558,16 @@ class ActivityStarter {
startedActivityStackId = mTargetStack.mStackId;
}
if (startedActivityStackId == DOCKED_STACK_ID && prevFocusedStackId == HOME_STACK_ID) {
// If we launched the activity from a no display activity that was launched from the home
// screen, we also need to start recents to un-minimize the docked stack, since the
// noDisplay activity will be finished shortly after.
// TODO: We should prevent noDisplay activities from affecting task/stack ordering and
// visibility instead of using this flag.
final boolean noDisplayActivityOverHome = mSourceRecord != null
&& mSourceRecord.noDisplay
&& mSourceRecord.task.getTaskToReturnTo() == HOME_ACTIVITY_TYPE;
if (startedActivityStackId == DOCKED_STACK_ID
&& (prevFocusedStackId == HOME_STACK_ID || noDisplayActivityOverHome)) {
final ActivityStack homeStack = mSupervisor.getStack(HOME_STACK_ID);
final ActivityRecord topActivityHomeStack = homeStack != null
? homeStack.topRunningActivityLocked() : null;