Remove test from STS Business Logic for conflicts
Bug: 219090760
Bug: 218715631
Bug: 222217286
Test: compiles
Change-Id: I92abe161de250db382f6fd917dfb3156b8fafd54
diff --git a/tests/tests/security/src/android/security/cts/IsolatedProcessTest.java b/tests/tests/security/src/android/security/cts/IsolatedProcessTest.java
index b43f489..91e39e8 100644
--- a/tests/tests/security/src/android/security/cts/IsolatedProcessTest.java
+++ b/tests/tests/security/src/android/security/cts/IsolatedProcessTest.java
@@ -15,6 +15,7 @@
*/
package android.security.cts;
+import android.app.Instrumentation;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -25,8 +26,8 @@
import android.platform.test.annotations.AsbSecurityTest;
import android.security.cts.IIsolatedService;
import android.security.cts.IsolatedService;
-import com.android.sts.common.util.StsExtraBusinessLogicTestCase;
import android.util.Log;
+import androidx.test.InstrumentationRegistry;
import com.android.internal.util.ArrayUtils;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -39,7 +40,7 @@
import org.junit.Test;
@RunWith(AndroidJUnit4.class)
-public class IsolatedProcessTest extends StsExtraBusinessLogicTestCase {
+public class IsolatedProcessTest {
static final String TAG = IsolatedProcessTest.class.getSimpleName();
private static final long BIND_SERVICE_TIMEOUT = 5000;
@@ -72,6 +73,10 @@
}
};
+ private static Instrumentation getInstrumentation() {
+ return InstrumentationRegistry.getInstrumentation();
+ }
+
@Before
public void setUp() throws InterruptedException {
mLatch = new CountDownLatch(1);
