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

Merge "Fix other tests be affected by mocked local services." into rvc-dev

Browse Source
This commit is contained in:
Wei Sheng Shih
2020-05-12 10:19:45 +00:00
committed by Android (Google) Code Review
parent 8e726a2ef7 30fa728060
commit d1979ef0f8
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.am.ActivityManagerService;
import com.android.server.pm.PackageManagerService; import com.android.server.pm.PackageManagerService;
import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
@@ -161,6 +162,12 @@ public class ActivityStartInterceptorTest {
mAInfo.packageName = mAInfo.applicationInfo.packageName = TEST_PACKAGE_NAME; mAInfo.packageName = mAInfo.applicationInfo.packageName = TEST_PACKAGE_NAME;
} }
@After
public void tearDown() {
LocalServices.removeServiceForTest(ActivityManagerInternal.class);
LocalServices.removeServiceForTest(DevicePolicyManagerInternal.class);
}
@Test @Test
public void testSuspendedByAdminPackage() { public void testSuspendedByAdminPackage() {
// GIVEN the package we're about to launch is currently suspended // GIVEN the package we're about to launch is currently suspended