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

This commit is contained in:
Wei Sheng Shih
2020-05-12 10:19:45 +00:00
committed by Android (Google) Code Review

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