diff options
| author | 2022-01-23 16:24:53 +0000 | |
|---|---|---|
| committer | 2022-01-23 16:24:53 +0000 | |
| commit | 7aff969d17ee24fdf148e80b0a6839930e37ff37 (patch) | |
| tree | 821af706576d1ad51044607147c7a11a28c8f232 | |
| parent | 76dfa05df908a03fa30fa8e2b89f0ec44e458ec2 (diff) | |
| parent | 287657ca9325aec92df5f3741b5ebe0e27b11036 (diff) | |
Merge "Do not resume activity if behind a translucent task"
| -rw-r--r-- | services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/RootWindowContainer.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java b/services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java index 963f3265757d..8d3e07116693 100644 --- a/services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java +++ b/services/core/java/com/android/server/wm/EnsureActivitiesVisibleHelper.java @@ -97,7 +97,7 @@ class EnsureActivitiesVisibleHelper { // activities are actually behind other fullscreen activities, but still required // to be visible (such as performing Recents animation). final boolean resumeTopActivity = mTop != null && !mTop.mLaunchTaskBehind - && mTaskFragment.isTopActivityFocusable() + && mTaskFragment.canBeResumed(starting) && (starting == null || !starting.isDescendantOf(mTaskFragment)); ArrayList<TaskFragment> adjacentTaskFragments = null; diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index ba13ace9db33..d031bec5443f 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -3674,7 +3674,8 @@ class RootWindowContainer extends WindowContainer<DisplayContent> try { if (mTaskSupervisor.realStartActivityLocked(r, mApp, - mTop == r && r.isFocusable() /* andResume */, true /* checkConfig */)) { + mTop == r && r.getTask().canBeResumed(r) /* andResume */, + true /* checkConfig */)) { mHasActivityStarted = true; } } catch (RemoteException e) { |