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

Merge "[DO NOT MERGE] AML: Handle NoDisplayActivities correctly" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-02-19 22:45:16 +00:00
committed by Android (Google) Code Review
parent 06cfb175bd 6397dd1c92
commit 5a50cb42b7
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/am/ActivityMetricsLogger.java
View File

@@ -497,6 +497,16 @@ class ActivityMetricsLogger {
mHandler.obtainMessage(MSG_CHECK_VISIBILITY, args).sendToTarget(); 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) { private void checkVisibility(TaskRecord t, ActivityRecord r) {
synchronized (mSupervisor.mService) { 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 // 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 && !t.isVisible()) { if (info != null && !hasVisibleNonFinishingActivity(t)) {
if (DEBUG_METRICS) Slog.i(TAG, "notifyVisibilityChanged to invisible" if (DEBUG_METRICS) Slog.i(TAG, "notifyVisibilityChanged to invisible"
+ " activity=" + r); + " activity=" + r);
logAppTransitionCancel(info); logAppTransitionCancel(info);