Adds SIM PUK locked conditions to e911 calling
-Incorperates logic for PUK locked SIMs when determining which slot to
place the emergency call on.
- Fixes EmergencyCallStateListenerTest as well
- Disables failing VVM tests until they are moved to the Dialer scope
Test: Added e911 calling unit tests
Bug: 31942934
Change-Id: I3ac7b3a81874665eca47297893edd6ee9746e49b
diff --git a/tests/src/com/android/TelephonyTestBase.java b/tests/src/com/android/TelephonyTestBase.java
index 6dee12b..044f26b 100644
--- a/tests/src/com/android/TelephonyTestBase.java
+++ b/tests/src/com/android/TelephonyTestBase.java
@@ -18,10 +18,9 @@
import android.content.Context;
import android.os.Handler;
+import android.os.Looper;
import android.support.test.InstrumentationRegistry;
-import com.android.phone.MockitoHelper;
-
import org.mockito.MockitoAnnotations;
import java.util.concurrent.CountDownLatch;
@@ -33,16 +32,17 @@
public class TelephonyTestBase {
protected Context mContext;
- MockitoHelper mMockitoHelper = new MockitoHelper();
public void setUp() throws Exception {
mContext = InstrumentationRegistry.getTargetContext();
- mMockitoHelper.setUp(mContext, getClass());
MockitoAnnotations.initMocks(this);
+ // Set up the looper if it does not exist on the test thread.
+ if (Looper.myLooper() == null) {
+ Looper.prepare();
+ }
}
public void tearDown() throws Exception {
- mMockitoHelper.tearDown();
}
protected final void waitForHandlerAction(Handler h, long timeoutMillis) {