[DO NOT MERGE] AML: Handle NoDisplayActivities correctly
There is a race when trying to determine if the launching activity is a trampoline activity or if its a NoDisplay activity that will never draw on screen. If the activity becomes invisible, its visible state in ActivityRecord may not change to invisible before the activity finishes. This is a quick fix to also check if ActivityRecord is finishing to determine if the activity is no longer visible. Bug: 80380150 Test: atest CtsActivityManagerDeviceTestCases:ActivityMetricsLoggerTests Change-Id: I55251f03db7390d6a3465eff851c4635680a2e07
This commit is contained in:
@@ -497,6 +497,16 @@ class ActivityMetricsLogger {
|
||||
mHandler.obtainMessage(MSG_CHECK_VISIBILITY, args).sendToTarget();
|
||||
}
|
||||
|
||||
private boolean hasVisibleNonFinishingActivity(TaskRecord t) {
|
||||
for (int i = t.mActivities.size() - 1; i >= 0; --i) {
|
||||
final ActivityRecord r = t.mActivities.get(i);
|
||||
if (r.visible && !r.finishing) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private void checkVisibility(TaskRecord t, ActivityRecord r) {
|
||||
synchronized (mSupervisor.mService) {
|
||||
|
||||
@@ -505,7 +515,7 @@ class ActivityMetricsLogger {
|
||||
|
||||
// If we have an active transition that's waiting on a certain activity that will be
|
||||
// invisible now, we'll never get onWindowsDrawn, so abort the transition if necessary.
|
||||
if (info != null && !t.isVisible()) {
|
||||
if (info != null && !hasVisibleNonFinishingActivity(t)) {
|
||||
if (DEBUG_METRICS) Slog.i(TAG, "notifyVisibilityChanged to invisible"
|
||||
+ " activity=" + r);
|
||||
logAppTransitionCancel(info);
|
||||
|
||||
Reference in New Issue
Block a user