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

Merge "Fix issue where NOT_VISIBLE state is sometimes not logged" into sc-v2-dev am: 8eb5761cfd

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16214753

Change-Id: I0fe1ccd2ab13d962730913c5b58955d43df5b623
This commit is contained in:
Tom Natan
2021-11-11 11:13:31 +00:00
committed by Automerger Merge Worker
parent dad7e5828d 8eb5761cfd
commit c5b3558391
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -770,10 +770,6 @@ class ActivityMetricsLogger {
if (compatStateInfo.mLastLoggedActivity == r) { if (compatStateInfo.mLastLoggedActivity == r) {
compatStateInfo.mLastLoggedActivity = null; compatStateInfo.mLastLoggedActivity = null;
} }
if (compatStateInfo.mVisibleActivities.isEmpty()) {
// No need to keep the entry if there are no visible activities.
mPackageUidToCompatStateInfo.remove(packageUid);
}
} }
/** /**
@@ -1269,13 +1265,14 @@ class ActivityMetricsLogger {
* activity. * activity.
* <li>If the current state is NOT_VISIBLE, there is a previously logged state for the * <li>If the current state is NOT_VISIBLE, there is a previously logged state for the
* package UID and there are no other visible activities with the same package UID. * package UID and there are no other visible activities with the same package UID.
* <li>The last logged activity with the same package UID is either {@code activity} or the * <li>The last logged activity with the same package UID is either {@code activity} (or an
* last logged state is NOT_VISIBLE or NOT_LETTERBOXED. * activity that has been removed) or the last logged state is NOT_VISIBLE or NOT_LETTERBOXED.
* </ul> * </ul>
* *
* <p>If the current state is NOT_VISIBLE and the previous state which was logged by {@code * <p>If the current state is NOT_VISIBLE and the previous state which was logged by {@code
* activity} wasn't, looks for the first visible activity with the same package UID that has * activity} (or an activity that has been removed) wasn't, looks for the first visible activity
* a letterboxed state, or a non-letterboxed state if there isn't one, and logs that state. * with the same package UID that has a letterboxed state, or a non-letterboxed state if
* there isn't one, and logs that state.
* *
* <p>This method assumes that the caller is wrapping the call with a synchronized block so * <p>This method assumes that the caller is wrapping the call with a synchronized block so
* that there won't be a race condition between two activities with the same package. * that there won't be a race condition between two activities with the same package.
@@ -1311,14 +1308,14 @@ class ActivityMetricsLogger {
if (!isVisible && !visibleActivities.isEmpty()) { if (!isVisible && !visibleActivities.isEmpty()) {
// There is another visible activity for this package UID. // There is another visible activity for this package UID.
if (activity == lastLoggedActivity) { if (lastLoggedActivity == null || activity == lastLoggedActivity) {
// Make sure a new visible state is logged if needed. // Make sure a new visible state is logged if needed.
findAppCompatStateToLog(compatStateInfo, packageUid); findAppCompatStateToLog(compatStateInfo, packageUid);
} }
return; return;
} }
if (activity != lastLoggedActivity if (lastLoggedActivity != null && activity != lastLoggedActivity
&& lastLoggedState != APP_COMPAT_STATE_CHANGED__STATE__NOT_VISIBLE && lastLoggedState != APP_COMPAT_STATE_CHANGED__STATE__NOT_VISIBLE
&& lastLoggedState != APP_COMPAT_STATE_CHANGED__STATE__NOT_LETTERBOXED) { && lastLoggedState != APP_COMPAT_STATE_CHANGED__STATE__NOT_LETTERBOXED) {
// Another visible activity for this package UID has logged a letterboxed state. // Another visible activity for this package UID has logged a letterboxed state.
@@ -1332,15 +1329,25 @@ class ActivityMetricsLogger {
* Looks for the first visible activity in {@code compatStateInfo} that has a letterboxed * Looks for the first visible activity in {@code compatStateInfo} that has a letterboxed
* state, or a non-letterboxed state if there isn't one, and logs that state for the given * state, or a non-letterboxed state if there isn't one, and logs that state for the given
* {@code packageUid}. * {@code packageUid}.
*
* <p>If there is a visible activity in {@code compatStateInfo} with the same state as the
* last logged state for the given {@code packageUid}, changes the last logged activity to
* reference the first such activity without actually logging the same state twice.
*/ */
private void findAppCompatStateToLog(PackageCompatStateInfo compatStateInfo, int packageUid) { private void findAppCompatStateToLog(PackageCompatStateInfo compatStateInfo, int packageUid) {
final ArrayList<ActivityRecord> visibleActivities = compatStateInfo.mVisibleActivities; final ArrayList<ActivityRecord> visibleActivities = compatStateInfo.mVisibleActivities;
final int lastLoggedState = compatStateInfo.mLastLoggedState;
ActivityRecord activityToLog = null; ActivityRecord activityToLog = null;
int stateToLog = APP_COMPAT_STATE_CHANGED__STATE__NOT_VISIBLE; int stateToLog = APP_COMPAT_STATE_CHANGED__STATE__NOT_VISIBLE;
for (int i = 0; i < visibleActivities.size(); i++) { for (int i = 0; i < visibleActivities.size(); i++) {
ActivityRecord activity = visibleActivities.get(i); ActivityRecord activity = visibleActivities.get(i);
int state = activity.getAppCompatState(); int state = activity.getAppCompatState();
if (state == lastLoggedState) {
// Change last logged activity without logging the same state twice.
compatStateInfo.mLastLoggedActivity = activity;
return;
}
if (state == APP_COMPAT_STATE_CHANGED__STATE__NOT_VISIBLE) { if (state == APP_COMPAT_STATE_CHANGED__STATE__NOT_VISIBLE) {
// This shouldn't happen. // This shouldn't happen.
Slog.w(TAG, "Visible activity with NOT_VISIBLE App Compat state for package UID: " Slog.w(TAG, "Visible activity with NOT_VISIBLE App Compat state for package UID: "