From 593fb6b8f95b686d569c2b75078494775d543a49 Mon Sep 17 00:00:00 2001
From: Jing Ji <jji@google.com>
Date: Wed, 25 Aug 2021 00:04:42 -0700
Subject: [PATCH] Fix test failure in FrameworksServicesTests

Bug: 195955563
Test: atest FrameworksServicesTests
Change-Id: Id6cba0632b5104a1f94ca9e59489ec7effe7a791
---
 .../java/com/android/server/am/ProcessErrorStateRecord.java  | 5 +++--
 .../src/com/android/server/am/ActivityManagerTest.java       | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/am/ProcessErrorStateRecord.java b/services/core/java/com/android/server/am/ProcessErrorStateRecord.java
index 8d3e442766204..a32fe02644d34 100644
--- a/services/core/java/com/android/server/am/ProcessErrorStateRecord.java
+++ b/services/core/java/com/android/server/am/ProcessErrorStateRecord.java
@@ -281,7 +281,8 @@ class ProcessErrorStateRecord {
             EventLog.writeEvent(EventLogTags.AM_ANR, mApp.userId, pid, mApp.processName,
                     mApp.info.flags, annotation);
 
-            if (mService.mTraceErrorLogger.isAddErrorIdEnabled()) {
+            if (mService.mTraceErrorLogger != null
+                    && mService.mTraceErrorLogger.isAddErrorIdEnabled()) {
                 errorId = mService.mTraceErrorLogger.generateErrorId();
                 mService.mTraceErrorLogger.addErrorIdToTrace(mApp.processName, errorId);
             } else {
@@ -427,7 +428,7 @@ class ProcessErrorStateRecord {
         float loadingProgress = 1;
         IncrementalMetrics incrementalMetrics = null;
         final PackageManagerInternal packageManagerInternal = mService.getPackageManagerInternal();
-        if (mApp.info != null && mApp.info.packageName != null) {
+        if (mApp.info != null && mApp.info.packageName != null && packageManagerInternal != null) {
             IncrementalStatesInfo incrementalStatesInfo =
                     packageManagerInternal.getIncrementalStatesInfo(
                             mApp.info.packageName, mApp.uid, mApp.userId);
diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java b/services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java
index 850f8818b5168..327a80e13049b 100644
--- a/services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java
@@ -470,6 +470,8 @@ public class ActivityManagerTest {
             sendCommand(COMMAND_UNBIND_SERVICE, TEST_APP2, TEST_APP1, null);
             runShellCommand("cmd deviceidle whitelist -" + TEST_APP1);
             runShellCommand("cmd deviceidle whitelist -" + TEST_APP2);
+            am.forceStopPackage(TEST_APP1);
+            am.forceStopPackage(TEST_APP2);
         }
     }
 
@@ -700,6 +702,7 @@ public class ActivityManagerTest {
             am.removeOnUidImportanceListener(uidListener1);
             am.removeOnUidImportanceListener(uidListener2);
             am.removeOnUidImportanceListener(uidListener3);
+            am.forceStopPackage(TEST_APP1);
         }
     }