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

Merge "[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-07 04:32:08 +00:00
committed by Android (Google) Code Review
parent c6e84150fa 43b8bcc014
commit 057b8a994b
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java
View File

@@ -95,7 +95,7 @@ class EnsureActivitiesVisibleHelper {
// activities are actually behind other fullscreen activities, but still required // activities are actually behind other fullscreen activities, but still required
// to be visible (such as performing Recents animation). // to be visible (such as performing Recents animation).
final boolean resumeTopActivity = mTop != null && !mTop.mLaunchTaskBehind final boolean resumeTopActivity = mTop != null && !mTop.mLaunchTaskBehind
&& mContiner.isTopActivityFocusable() && mContiner.canBeResumed(starting)
&& (starting == null || !starting.isDescendantOf(mContiner)); && (starting == null || !starting.isDescendantOf(mContiner));
final PooledConsumer f = PooledLambda.obtainConsumer( final PooledConsumer f = PooledLambda.obtainConsumer(

3
services/core/java/com/android/server/wm/RootWindowContainer.java
View File

@@ -1963,7 +1963,8 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
} }
try { try {
if (mStackSupervisor.realStartActivityLocked(r, app, top == r /*andResume*/, if (mStackSupervisor.realStartActivityLocked(r, app,
top == r && r.getTask().canBeResumed(r) /*andResume*/,
true /*checkConfig*/)) { true /*checkConfig*/)) {
mTmpBoolean = true; mTmpBoolean = true;
} }

11
services/core/java/com/android/server/wm/Task.java
View File

@@ -3638,6 +3638,17 @@ class Task extends WindowContainer<WindowContainer> {
return getVisibility(starting) != STACK_VISIBILITY_INVISIBLE; return getVisibility(starting) != STACK_VISIBILITY_INVISIBLE;
} }
/**
* Returns {@code true} is the activity in this Task can be resumed.
*
* @param starting The currently starting activity or {@code null} if there is none.
*/
boolean canBeResumed(@Nullable ActivityRecord starting) {
// No need to resume activity in Task that is not visible.
return isTopActivityFocusable()
&& getVisibility(starting) == STACK_VISIBILITY_VISIBLE;
}
/** /**
* Returns true if the task should be visible. * Returns true if the task should be visible.
* *