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

Commit 00168492 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "only log calling package for instant apps" into oc-dev

parents 3244faae 56279cb0

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

+3 −3
Original line number Diff line number Diff line
@@ -314,7 +314,8 @@ class ActivityMetricsLogger { 
            builder.setPackageName(info.launchedActivity.packageName);

            builder.setType(type);

            builder.addTaggedData(FIELD_CLASS_NAME, info.launchedActivity.info.name);

            if (info.launchedActivity.launchedFromPackage != null) {

            final boolean isInstantApp = info.launchedActivity.info.applicationInfo.isInstantApp();

            if (isInstantApp && info.launchedActivity.launchedFromPackage != null) {

                builder.addTaggedData(APP_TRANSITION_CALLING_PACKAGE_NAME,

                        info.launchedActivity.launchedFromPackage);

            }
@@ -323,8 +324,7 @@ class ActivityMetricsLogger { 
                        info.launchedActivity.info.launchToken);

                info.launchedActivity.info.launchToken = null;

            }

            builder.addTaggedData(APP_TRANSITION_IS_EPHEMERAL,

                    info.launchedActivity.info.applicationInfo.isInstantApp() ? 1 : 0);

            builder.addTaggedData(APP_TRANSITION_IS_EPHEMERAL, isInstantApp ? 1 : 0);

            builder.addTaggedData(APP_TRANSITION_DEVICE_UPTIME_SECONDS,

                    mCurrentTransitionDeviceUptime);

            builder.addTaggedData(APP_TRANSITION_DELAY_MS, mCurrentTransitionDelayMs);