From 8d9b93cb7df7a677de57c3ea4cc0ceedbbe911ef Mon Sep 17 00:00:00 2001 From: Kweku Adams Date: Wed, 9 Mar 2022 15:59:34 +0000 Subject: [PATCH] Remove service before adding test mock. Bug: 223101827 Change-Id: I45788f4ca7add353135ff3af73de2b5f4997ff14 Test: N/A --- .../src/com/android/server/usage/AppStandbyControllerTests.java | 1 + 1 file changed, 1 insertion(+) diff --git a/services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java b/services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java index 18d3f3d0e8056..1ce957d1e7680 100644 --- a/services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java +++ b/services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java @@ -489,6 +489,7 @@ public class AppStandbyControllerTests { @Before public void setUp() throws Exception { + LocalServices.removeServiceForTest(UsageStatsManagerInternal.class); LocalServices.addService( UsageStatsManagerInternal.class, mock(UsageStatsManagerInternal.class)); MyContextWrapper myContext = new MyContextWrapper(InstrumentationRegistry.getContext());