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

Merge "Don't show the embedded activities if visible needed activity without showWhenLocked" into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-10-26 23:26:52 +00:00
committed by Android (Google) Code Review
parent 398ef465ba 4f99b0dcac
commit ae3c5c8ca8
1 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -4157,18 +4157,39 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
* conditions a) above. * conditions a) above.
* Multi-windowing mode will be exited if {@code true} is returned. * Multi-windowing mode will be exited if {@code true} is returned.
*/ */
boolean canShowWhenLocked() { private static boolean canShowWhenLocked(ActivityRecord r) {
if (!inPinnedWindowingMode() && (mShowWhenLocked || containsShowWhenLockedWindow())) { if (r == null || r.getTaskFragment() == null) {
return false;
}
if (!r.inPinnedWindowingMode() && (r.mShowWhenLocked || r.containsShowWhenLockedWindow())) {
return true; return true;
} else if (mInheritShownWhenLocked) { } else if (r.mInheritShownWhenLocked) {
final ActivityRecord r = task.getActivityBelow(this); final ActivityRecord activity = r.getTaskFragment().getActivityBelow(r);
return r != null && !r.inPinnedWindowingMode() && (r.mShowWhenLocked return activity != null && !activity.inPinnedWindowingMode()
|| r.containsShowWhenLockedWindow()); && (activity.mShowWhenLocked || activity.containsShowWhenLockedWindow());
} else { } else {
return false; return false;
} }
} }
/**
* Determines if the activity can show while lock-screen is displayed. System displays
* activities while lock-screen is displayed only if all activities
* {@link #canShowWhenLocked(ActivityRecord)}.
* @see #canShowWhenLocked(ActivityRecord)
*/
boolean canShowWhenLocked() {
final TaskFragment taskFragment = getTaskFragment();
if (taskFragment != null && taskFragment.getAdjacentTaskFragment() != null
&& taskFragment.isEmbedded()) {
final TaskFragment adjacentTaskFragment = taskFragment.getAdjacentTaskFragment();
final ActivityRecord r = adjacentTaskFragment.getTopNonFinishingActivity();
return canShowWhenLocked(this) && canShowWhenLocked(r);
} else {
return canShowWhenLocked(this);
}
}
/** /**
* @return Whether we are allowed to show non-starting windows at the moment. We disallow * @return Whether we are allowed to show non-starting windows at the moment. We disallow
* showing windows during transitions in case we have windows that have wide-color-gamut * showing windows during transitions in case we have windows that have wide-color-gamut