Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix other tests be affected by mocked local services.

Browse Source 
Remove mocked local services after test finish, so it won't affect
other tests.

Fixes: 156221489
Test: atest ActivityStartInterceptorTest AppWindowTokenTests
Change-Id: I2e868204fe098c616ff8b2b17c3d47e42d799124
This commit is contained in:
wilsonshih
2020-05-12 15:01:19 +08:00
parent 47059f7654
commit 30fa728060
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/tests/wmtests/src/com/android/server/wm/ActivityStartInterceptorTest.java
View File

@@ -53,6 +53,7 @@ import com.android.server.LocalServices;
import com.android.server.am.ActivityManagerService;
import com.android.server.pm.PackageManagerService;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -161,6 +162,12 @@ public class ActivityStartInterceptorTest {
mAInfo.packageName = mAInfo.applicationInfo.packageName = TEST_PACKAGE_NAME;
}
@After
public void tearDown() {
LocalServices.removeServiceForTest(ActivityManagerInternal.class);
LocalServices.removeServiceForTest(DevicePolicyManagerInternal.class);
}
@Test
public void testSuspendedByAdminPackage() {
// GIVEN the package we're about to launch is currently suspended