Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa220ec6 authored by Vishnu Nair's avatar Vishnu Nair Committed by android-build-merger
Browse files

Merge "ActivityMetricsLogger: Fix cold launches treated incorrectly as invalid... 

Merge "ActivityMetricsLogger: Fix cold launches treated incorrectly as invalid transitions" into qt-dev am: 850c6dcf
am: 81d7e8e3

Change-Id: I2fae99d418d6a2672480b6dd9a49b2ea81fbe354
parents c43bb524 81d7e8e3

services/core/java/com/android/server/wm/ActivityMetricsLogger.java

+9 −20
Original line number Diff line number Diff line
@@ -26,20 +26,6 @@ import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.APP_TR 
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.APP_TRANSITION_REPORTED_DRAWN_MS;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.APP_TRANSITION_STARTING_WINDOW_DELAY_MS;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.APP_TRANSITION_WINDOWS_DRAWN_DELAY_MS;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_ACTIVITY_RECORD_FLAGS;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_ACTIVITY_RECORD_IS_FULLSCREEN;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_ACTIVITY_RECORD_IS_NO_DISPLAY;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_ACTIVITY_RECORD_IS_VISIBLE;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_ACTIVITY_RECORD_IS_VISIBLE_IGNORING_KEYGUARD;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_ACTIVITY_RECORD_LAUNCH_MODE;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_ACTIVITY_RECORD_MILLIS_SINCE_LAST_LAUNCH;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_ACTIVITY_RECORD_MILLIS_SINCE_LAST_VISIBLE;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_ACTIVITY_RECORD_PROCESS_NAME;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_ACTIVITY_RECORD_REAL_ACTIVITY;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_ACTIVITY_RECORD_RESULT_TO_PKG_NAME;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_ACTIVITY_RECORD_RESULT_TO_SHORT_COMPONENT_NAME;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_ACTIVITY_RECORD_SHORT_COMPONENT_NAME;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_ACTIVITY_RECORD_TARGET_ACTIVITY;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_CALLING_PACKAGE_NAME;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_CALLING_UID;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_CALLING_UID_HAS_ANY_VISIBLE_WINDOW;
@@ -62,12 +48,7 @@ import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_ 
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_REAL_CALLING_UID;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_REAL_CALLING_UID_HAS_ANY_VISIBLE_WINDOW;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_REAL_CALLING_UID_PROC_STATE;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_TARGET_PACKAGE_NAME;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_TARGET_SHORT_COMPONENT_NAME;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_TARGET_UID;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_TARGET_UID_HAS_ANY_VISIBLE_WINDOW;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_TARGET_UID_PROC_STATE;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_TARGET_WHITELIST_TAG;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.PACKAGE_OPTIMIZATION_COMPILATION_FILTER;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.PACKAGE_OPTIMIZATION_COMPILATION_REASON;

import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.TYPE_TRANSITION_COLD_LAUNCH;
@@ -671,6 +652,11 @@ class ActivityMetricsLogger { 
            final WindowingModeTransitionInfo info = mWindowingModeTransitionInfo.valueAt(index);

            final int type = getTransitionType(info);

            if (type == INVALID_TRANSITION_TYPE) {

                if (DEBUG_METRICS) {

                    Slog.i(TAG, "invalid transition type"

                            + " processRunning=" + info.currentTransitionProcessRunning

                            + " startResult=" + info.startResult);

                }

                return;

            }
@@ -921,7 +907,10 @@ class ActivityMetricsLogger { 
            } else if (info.startResult == START_TASK_TO_FRONT) {

                return TYPE_TRANSITION_HOT_LAUNCH;

            }

        } else if (info.startResult == START_SUCCESS) {

        } else if (info.startResult == START_SUCCESS

                || (info.startResult == START_TASK_TO_FRONT)) {

            // TaskRecord may still exist when cold launching an activity and the start

            // result will be set to START_TASK_TO_FRONT. Treat this as a COLD launch.

            return TYPE_TRANSITION_COLD_LAUNCH;

        }

        return INVALID_TRANSITION_TYPE;