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

Merge "Apply setAlwaysOnTop when recycling Task." into sc-v2-dev

Browse Source
This commit is contained in:
Yuncheol Heo
2021-07-21 17:43:02 +00:00
committed by Android (Google) Code Review
parent c37bf4e5f6 c7b59dbebf
commit ee4ae77c5f
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/wm/ActivityStarter.java
View File

@@ -1559,6 +1559,7 @@ class ActivityStarter {
TaskFragment inTaskFragment, boolean restrictedBgActivity, TaskFragment inTaskFragment, boolean restrictedBgActivity,
NeededUriGrants intentGrants) { NeededUriGrants intentGrants) {
int result = START_CANCELED; int result = START_CANCELED;
boolean startResultSuccessful = false;
final Task startedActivityRootTask; final Task startedActivityRootTask;
// Create a transition now to record the original intent of actions taken within // Create a transition now to record the original intent of actions taken within
@@ -1584,6 +1585,15 @@ class ActivityStarter {
result = startActivityInner(r, sourceRecord, voiceSession, voiceInteractor, result = startActivityInner(r, sourceRecord, voiceSession, voiceInteractor,
startFlags, doResume, options, inTask, inTaskFragment, restrictedBgActivity, startFlags, doResume, options, inTask, inTaskFragment, restrictedBgActivity,
intentGrants); intentGrants);
startResultSuccessful = ActivityManager.isStartResultSuccessful(result);
final boolean taskAlwaysOnTop = options != null && options.getTaskAlwaysOnTop();
// Apply setAlwaysOnTop when starting an Activity is successful regardless of creating
// a new Activity or recycling the existing Activity.
if (taskAlwaysOnTop && startResultSuccessful) {
final Task targetRootTask =
mTargetRootTask != null ? mTargetRootTask : mTargetTask.getRootTask();
targetRootTask.setAlwaysOnTop(true);
}
} finally { } finally {
Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER); Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
startedActivityRootTask = handleStartResult(r, result); startedActivityRootTask = handleStartResult(r, result);
@@ -1591,7 +1601,7 @@ class ActivityStarter {
mSupervisor.mUserLeaving = false; mSupervisor.mUserLeaving = false;
// Transition housekeeping // Transition housekeeping
if (!ActivityManager.isStartResultSuccessful(result)) { if (!startResultSuccessful) {
if (newTransition != null) { if (newTransition != null) {
newTransition.abort(); newTransition.abort();
} }
@@ -1755,11 +1765,6 @@ class ActivityStarter {
if (!mAvoidMoveToFront && mDoResume) { if (!mAvoidMoveToFront && mDoResume) {
mTargetRootTask.getRootTask().moveToFront("reuseOrNewTask", targetTask); mTargetRootTask.getRootTask().moveToFront("reuseOrNewTask", targetTask);
if (mOptions != null) {
if (mOptions.getTaskAlwaysOnTop()) {
mTargetRootTask.setAlwaysOnTop(true);
}
}
if (!mTargetRootTask.isTopRootTaskInDisplayArea() && mService.mInternal.isDreaming()) { if (!mTargetRootTask.isTopRootTaskInDisplayArea() && mService.mInternal.isDreaming()) {
// Launching underneath dream activity (fullscreen, always-on-top). Run the launch- // Launching underneath dream activity (fullscreen, always-on-top). Run the launch-
// -behind transition so the Activity gets created and starts in visible state. // -behind transition so the Activity gets created and starts in visible state.