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

[RESTRICT AUTOMERGE] Do not resume activity if behind a translucent task am: 0a4f661ec6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16713864

Change-Id: I299e3228a5bc5195b1bd95593da700828cbac1f1
This commit is contained in:
Jeff Chang
2022-03-07 02:49:57 +00:00
committed by Automerger Merge Worker
parent ff844f4337 0a4f661ec6
commit 11f5a2b805
2 changed files with 3 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

@@ -97,7 +97,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
&& mTaskFragment.isTopActivityFocusable() && mTaskFragment.canBeResumed(starting)
&& (starting == null || !starting.isDescendantOf(mTaskFragment)); && (starting == null || !starting.isDescendantOf(mTaskFragment));
ArrayList<TaskFragment> adjacentTaskFragments = null; ArrayList<TaskFragment> adjacentTaskFragments = null;

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

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