commit af0ea31549db45a3d58f8dc05f124320be6b9987
author Vishnu Nair <vishnun@google.com> Mon Oct 15 16:23:55 2018 -0700
committer Vishnu Nair <vishnun@google.com> Mon Oct 15 16:23:55 2018 -0700
tree 1313d321f4ec50029a0211ba7ebf89766eddcb88
parent d80c72ab88aa4548a9af58d4a78e54fef18b3706

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

diff --git a/services/core/java/com/android/server/am/ActivityMetricsLogger.java b/services/core/java/com/android/server/am/ActivityMetricsLogger.java
index 7080e2b..e661627 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 @@
             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);