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

Merge "[AML] Check if launched activity has changed when handling visibility changes" into qt-dev

Browse Source 
am: cc0d8f3982

Change-Id: I0db27e1d8544ce647d62e63916843bf86ce59561
This commit is contained in:
Vishnu Nair
2019-06-17 15:02:41 -07:00
committed by android-build-merger
parent 9f7dd342f8 cc0d8f3982
commit 3aa7b56cb3
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
services/core/java/com/android/server/wm/ActivityMetricsLogger.java
View File

@@ -544,14 +544,30 @@ class ActivityMetricsLogger {
// If we have an active transition that's waiting on a certain activity that will be // 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. // invisible now, we'll never get onWindowsDrawn, so abort the transition if necessary.
if (info != null && !hasVisibleNonFinishingActivity(t)) {
if (DEBUG_METRICS) Slog.i(TAG, "notifyVisibilityChanged to invisible" // We have no active transitions.
+ " activity=" + r); if (info == null) {
logAppTransitionCancel(info); return;
mWindowingModeTransitionInfo.remove(r.getWindowingMode()); }
if (mWindowingModeTransitionInfo.size() == 0) {
reset(true /* abort */, info, "notifyVisibilityChanged to invisible"); // The notified activity whose visibility changed is no longer the launched activity.
} // We can still wait to get onWindowsDrawn.
if (info.launchedActivity != r) {
return;
}
// Check if there is any activity in the task that is visible and not finishing. If the
// launched activity finished before it is drawn and if there is another activity in
// the task then that activity will be draw on screen.
if (hasVisibleNonFinishingActivity(t)) {
return;
}
if (DEBUG_METRICS) Slog.i(TAG, "notifyVisibilityChanged to invisible activity=" + r);
logAppTransitionCancel(info);
mWindowingModeTransitionInfo.remove(r.getWindowingMode());
if (mWindowingModeTransitionInfo.size() == 0) {
reset(true /* abort */, info, "notifyVisibilityChanged to invisible");
} }
} }
} }