From 8669e99b7076964a1d42e6772611dc3488950e75 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Thu, 22 Oct 2020 21:23:15 +0900 Subject: [PATCH] Fix NPE of ActivityManagerInternalTest This is a follow up of I634f247e42a7e8e4535eedd76cf84089abdf1129 Bug: 136036078 Bug: 171450666 Test: atest FrameworksServicesTests:ActivityManagerInternalTest Change-Id: I9d10a644392d8ae4cf2ede7e18f2b77d09f9b00d --- .../src/com/android/server/am/ActivityManagerInternalTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityManagerInternalTest.java b/services/tests/servicestests/src/com/android/server/am/ActivityManagerInternalTest.java index d57fd4b467dbf..3b4699e70aecf 100644 --- a/services/tests/servicestests/src/com/android/server/am/ActivityManagerInternalTest.java +++ b/services/tests/servicestests/src/com/android/server/am/ActivityManagerInternalTest.java @@ -62,6 +62,8 @@ public class ActivityManagerInternalTest { .getContext(); doReturn(mServiceThreadRule.getThread().getThreadHandler()).when(mMockInjector) .getUiHandler(any()); + final ProcessList dummyList = new ProcessList(); + doReturn(dummyList).when(mMockInjector).getProcessList(any()); mAms = new ActivityManagerService(mMockInjector, mServiceThreadRule.getThread()); mAmi = mAms.new LocalService(); }