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

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

Merge "AM: Fix NPE in ActivityMetricsLogger"

parents 65182e51 af0ea315

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -230,14 +230,14 @@ class ActivityMetricsLogger { 
            launchedActivityLaunchToken = launchedActivity.info.launchToken;

            launchedActivityLaunchToken = launchedActivity.info.launchToken;

            launchedActivityAppRecordRequiredAbi = launchedActivity.app == null

            launchedActivityAppRecordRequiredAbi = launchedActivity.app == null

                    ? null

                    ? null

                    : info.launchedActivity.app.getRequiredAbi();

                    : launchedActivity.app.getRequiredAbi();

            reason = info.reason;

            reason = info.reason;

            startingWindowDelayMs = info.startingWindowDelayMs;

            startingWindowDelayMs = info.startingWindowDelayMs;

            bindApplicationDelayMs = info.bindApplicationDelayMs;

            bindApplicationDelayMs = info.bindApplicationDelayMs;

            windowsDrawnDelayMs = info.windowsDrawnDelayMs;

            windowsDrawnDelayMs = info.windowsDrawnDelayMs;

            type = getTransitionType(info);

            type = getTransitionType(info);

            processRecord = findProcessForActivity(info.launchedActivity);

            processRecord = findProcessForActivity(launchedActivity);

            processName = info.launchedActivity.processName;

            processName = launchedActivity.processName;

            userId = launchedActivity.userId;

            userId = launchedActivity.userId;

            launchedActivityShortComponentName = launchedActivity.shortComponentName;

            launchedActivityShortComponentName = launchedActivity.shortComponentName;

            activityRecordIdHashCode = System.identityHashCode(launchedActivity);

            activityRecordIdHashCode = System.identityHashCode(launchedActivity);