Clean up visibility related flags in ActivityRecord
- Replace visible and hiddenRequested flag by a single flag
mVisibleRequested.
- Merge setVisible() into setVisiblity().
Test: Refactoring, all existing tests pass.
Bug: 80414790
Change-Id: I7bafdb86e6b8431046775d3968d24f85c3fac45a
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index 96bac88..c62f60c 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -2212,7 +2212,7 @@
void addStartingWindowsForVisibleActivities(boolean taskSwitch) {
for (int activityNdx = getChildCount() - 1; activityNdx >= 0; --activityNdx) {
final ActivityRecord r = getChildAt(activityNdx);
- if (r.visible) {
+ if (r.mVisibleRequested) {
r.showStartingWindow(null /* prev */, false /* newTask */, taskSwitch);
}
}
@@ -2533,7 +2533,7 @@
for (int i = mChildren.size() - 1; i >= 0; i--) {
final ActivityRecord token = mChildren.get(i);
// skip hidden (or about to hide) apps
- if (token.mIsExiting || token.isClientHidden() || token.hiddenRequested) {
+ if (token.mIsExiting || token.isClientHidden() || !token.mVisibleRequested) {
continue;
}
final WindowState win = token.findMainWindow();
@@ -2753,7 +2753,7 @@
for (int i = mChildren.size() - 1; i >= 0; i--) {
final ActivityRecord token = mChildren.get(i);
// skip hidden (or about to hide) apps
- if (!token.mIsExiting && !token.isClientHidden() && !token.hiddenRequested) {
+ if (!token.mIsExiting && !token.isClientHidden() && token.mVisibleRequested) {
return token;
}
}