From af0ea31549db45a3d58f8dc05f124320be6b9987 Mon Sep 17 00:00:00 2001 From: Vishnu Nair Date: Mon, 15 Oct 2018 16:23:55 -0700 Subject: [PATCH] AM: Fix NPE in ActivityMetricsLogger Bug: b/117771642 Test: follow steps in b/117771642 Test: atest CtsActivityManagerDeviceTestCases:ActivityMetricsLoggerTests Change-Id: Iad3982062aefe7f8329bed6288380474540d0c70 --- services/core/java/com/android/server/am/ActivityMetricsLogger.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityMetricsLogger.java b/services/core/java/com/android/server/am/ActivityMetricsLogger.java index 7080e2bd58fd..e661627eda60 100644 --- a/services/core/java/com/android/server/am/ActivityMetricsLogger.java +++ b/services/core/java/com/android/server/am/ActivityMetricsLogger.java @@ -230,14 +230,14 @@ class ActivityMetricsLogger { launchedActivityLaunchToken = launchedActivity.info.launchToken; launchedActivityAppRecordRequiredAbi = launchedActivity.app == null ? null - : info.launchedActivity.app.getRequiredAbi(); + : launchedActivity.app.getRequiredAbi(); reason = info.reason; startingWindowDelayMs = info.startingWindowDelayMs; bindApplicationDelayMs = info.bindApplicationDelayMs; windowsDrawnDelayMs = info.windowsDrawnDelayMs; type = getTransitionType(info); - processRecord = findProcessForActivity(info.launchedActivity); - processName = info.launchedActivity.processName; + processRecord = findProcessForActivity(launchedActivity); + processName = launchedActivity.processName; userId = launchedActivity.userId; launchedActivityShortComponentName = launchedActivity.shortComponentName; activityRecordIdHashCode = System.identityHashCode(launchedActivity); -- 2.11.0