From 0ec0dba17ec90a9cb845120bd7d2fae62bf8383e Mon Sep 17 00:00:00 2001
From: Jing Ji <jji@google.com>
Date: Mon, 14 Sep 2020 00:37:14 -0700
Subject: Fix flaky test in ApplicationExitInfoTest

Bug: 160548789
Test: atest ApplicationExitInfoTest
Change-Id: I245147cf10733bd30c2c5d616aca5bbde15ee43b
---
 .../src/com/android/server/am/ApplicationExitInfoTest.java              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/tests/mockingservicestests/src/com/android/server/am/ApplicationExitInfoTest.java b/services/tests/mockingservicestests/src/com/android/server/am/ApplicationExitInfoTest.java
index 8db09b4f156c..e9a50b36693a 100644
--- a/services/tests/mockingservicestests/src/com/android/server/am/ApplicationExitInfoTest.java
+++ b/services/tests/mockingservicestests/src/com/android/server/am/ApplicationExitInfoTest.java
@@ -120,6 +120,7 @@ public class ApplicationExitInfoTest {
         mHandlerThread.start();
         mHandler = new Handler(mHandlerThread.getLooper());
         mProcessList = spy(new ProcessList());
+        ProcessList.sKillHandler = null;
         mAppExitInfoTracker = spy(new AppExitInfoTracker());
         setFieldValue(AppExitInfoTracker.class, mAppExitInfoTracker, "mIsolatedUidRecords",
                 spy(mAppExitInfoTracker.new IsolatedUidRecords()));
@@ -147,6 +148,7 @@ public class ApplicationExitInfoTest {
     public void tearDown() {
         LocalServices.removeServiceForTest(PackageManagerInternal.class);
         mHandlerThread.quit();
+        ProcessList.sKillHandler = null;
     }
 
     private static <T> void setFieldValue(Class clazz, Object obj, String fieldName, T val) {
-- 
cgit v1.2.3-59-g8ed1b