Revert "Split TeleService into a client apk and a lib."
This reverts commit 7412ad8dabaa6d028e30726fe75c46e47d0654b0.
Reason for revert: b/148821604
Change-Id: I18889d2d5b6861c6fd0e8c41eb72c3bc2e8ffb99
diff --git a/tests/Android.bp b/tests/Android.bp
index 90f9ce7..7ed234e 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -30,7 +30,7 @@
platform_apis: true,
certificate: "platform",
- instrumentation_for: "TeleServiceLib",
+ instrumentation_for: "TeleService",
static_libs: [
"androidx.test.rules",
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 17f4a8f..d434650 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -61,6 +61,6 @@
-->
<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.phone.lib"
+ android:targetPackage="com.android.phone"
android:label="Phone application tests." />
</manifest>
diff --git a/tests/src/com/android/phone/LocationAccessPolicyTest.java b/tests/src/com/android/phone/LocationAccessPolicyTest.java
index f2bc8d2..2061f38 100644
--- a/tests/src/com/android/phone/LocationAccessPolicyTest.java
+++ b/tests/src/com/android/phone/LocationAccessPolicyTest.java
@@ -35,7 +35,6 @@
import android.telephony.LocationAccessPolicy;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -172,7 +171,7 @@
mScenario = scenario;
}
- @Ignore
+
@Test
public void test() {
setupScenario(mScenario);
diff --git a/tests/src/com/android/services/telephony/ImsConferenceControllerTest.java b/tests/src/com/android/services/telephony/ImsConferenceControllerTest.java
index 19e802b..edfc34f 100644
--- a/tests/src/com/android/services/telephony/ImsConferenceControllerTest.java
+++ b/tests/src/com/android/services/telephony/ImsConferenceControllerTest.java
@@ -30,7 +30,6 @@
import com.android.internal.telephony.PhoneConstants;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@@ -110,7 +109,6 @@
* is PhoneConstants.PHONE_TYPE_IMS
* Expected: addConference for ImsConference is called twice
*/
- @Ignore
@Test
@SmallTest
public void testMergeMultiPartyCalls() {
diff --git a/tests/src/com/android/services/telephony/ImsConferenceTest.java b/tests/src/com/android/services/telephony/ImsConferenceTest.java
index d294604..7251402 100644
--- a/tests/src/com/android/services/telephony/ImsConferenceTest.java
+++ b/tests/src/com/android/services/telephony/ImsConferenceTest.java
@@ -38,7 +38,6 @@
import com.android.ims.internal.ConferenceParticipant;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@@ -66,7 +65,6 @@
.thenReturn(null);
}
- @Ignore
@Test
@SmallTest
public void testSinglePartyEmulation() {
@@ -114,7 +112,6 @@
/**
* Tests CEPs with disconnected participants present with disconnected state.
*/
- @Ignore
@Test
@SmallTest
public void testDisconnectParticipantViaDisconnectState() {
@@ -178,7 +175,6 @@
/**
* Tests CEPs with removed participants.
*/
- @Ignore
@Test
@SmallTest
public void testDisconnectParticipantViaRemoval() {
@@ -236,7 +232,6 @@
*
* This test verifies that we can still enter single party emulation in this case.
*/
- @Ignore
@Test
@SmallTest
public void testSinglePartyEmulationEnterOnDisconnectParticipant() {
@@ -295,7 +290,6 @@
* it triggered exiting single party conference mode (due to a bug) and caused the call to not
* be logged.
*/
- @Ignore
@Test
@SmallTest
public void testSinglePartyEmulationWithPreDisconnectParticipantUpdate() {
@@ -352,7 +346,6 @@
* Verify that the single party emulate correctly when the conference start with only
* one participant.
*/
- @Ignore
@Test
@SmallTest
public void testSinglePartyEmulationWithOneParticipantAtBeginning() {
@@ -377,7 +370,6 @@
/**
* Verify that we do not use single party emulation when a sim call manager is in use.
*/
- @Ignore
@Test
@SmallTest
public void testNoSinglePartyEmulationWithSimCallManager() {
@@ -416,7 +408,6 @@
assertEquals(2, imsConference.getNumberOfParticipants());
}
- @Ignore
@Test
@SmallTest
public void testNormalConference() {
diff --git a/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java b/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java
index d08f331..6e11e51 100644
--- a/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java
+++ b/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java
@@ -63,7 +63,6 @@
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
@@ -166,7 +165,6 @@
*
* Result: getFirstPhoneForEmergencyCall returns the default Voice SIM choice.
*/
- @Ignore
@Test
@SmallTest
public void testDefaultVoiceSimInService() {
@@ -189,7 +187,6 @@
*
* Result: getFirstPhoneForEmergencyCall returns the slot 1 phone
*/
- @Ignore
@Test
@SmallTest
public void testSlot1EmergencyOnly() {
@@ -212,7 +209,6 @@
*
* Result: getFirstPhoneForEmergencyCall returns the slot 1 phone
*/
- @Ignore
@Test
@SmallTest
public void testSlot1InService() {
@@ -237,7 +233,6 @@
* Result: getFirstPhoneForEmergencyCall returns the slot 1 phone. Although Slot 0 is more
* capable, it is locked, so use the other slot.
*/
- @Ignore
@Test
@SmallTest
public void testSlot0PukLocked() {
@@ -268,7 +263,6 @@
* Result: getFirstPhoneForEmergencyCall returns the slot 1 phone. Although Slot 0 is more
* capable, it is locked, so use the other slot.
*/
- @Ignore
@Test
@SmallTest
public void testSlot0PinLocked() {
@@ -299,7 +293,6 @@
* Result: getFirstPhoneForEmergencyCall returns the slot 0 phone. Although Slot 1 is more
* capable, it is locked, so use the other slot.
*/
- @Ignore
@Test
@SmallTest
public void testSlot1PukLocked() {
@@ -330,7 +323,6 @@
* Result: getFirstPhoneForEmergencyCall returns the slot 0 phone. Although Slot 1 is more
* capable, it is locked, so use the other slot.
*/
- @Ignore
@Test
@SmallTest
public void testSlot1PinLocked() {
@@ -360,7 +352,6 @@
* Result: getFirstPhoneForEmergencyCall returns the slot 1 phone because it is the only one
* with a SIM inserted (even if it is PUK locked)
*/
- @Ignore
@Test
@SmallTest
public void testSlot1PinLockedAndSlot0Absent() {
@@ -391,7 +382,6 @@
*
* Result: getFirstPhoneForEmergencyCall returns the slot 1 phone because it is more capable
*/
- @Ignore
@Test
@SmallTest
public void testSlot1HigherCapablity() {
@@ -420,7 +410,6 @@
* Result: getFirstPhoneForEmergencyCall returns the slot 1 phone because it has more
* capabilities.
*/
- @Ignore
@Test
@SmallTest
public void testSlot1MoreCapabilities() {
@@ -451,7 +440,6 @@
* Result: getFirstPhoneForEmergencyCall returns the slot 0 phone because it is more capable,
* ignoring that both SIMs are PUK locked.
*/
- @Ignore
@Test
@SmallTest
public void testSlot0MoreCapableBothPukLocked() {
@@ -479,7 +467,6 @@
*
* Result: getFirstPhoneForEmergencyCall returns the slot 0 phone because it is the first slot.
*/
- @Ignore
@Test
@SmallTest
public void testEqualCapabilityTwoSimsInserted() {
@@ -511,7 +498,6 @@
* Result: getFirstPhoneForEmergencyCall returns the slot 0 phone because it is the only one
* with a SIM inserted
*/
- @Ignore
@Test
@SmallTest
public void testEqualCapabilitySim0Inserted() {
@@ -543,7 +529,6 @@
* Result: getFirstPhoneForEmergencyCall returns the slot 1 phone because it is the only one
* with a SIM inserted
*/
- @Ignore
@Test
@SmallTest
public void testEqualCapabilitySim1Inserted() {
@@ -575,7 +560,6 @@
* Result: getFirstPhoneForEmergencyCall returns the slot 1 phone, since it is a higher
* capability
*/
- @Ignore
@Test
@SmallTest
public void testSim1HigherCapabilityNoSimsInserted() {
@@ -606,7 +590,6 @@
*
* Result: getFirstPhoneForEmergencyCall returns the slot 0 phone, since it is the first slot.
*/
- @Ignore
@Test
@SmallTest
public void testEqualCapabilityNoSimsInserted() {
@@ -637,7 +620,6 @@
* Verify that dial is called on the same phone again when retryOutgoingOriginalConnection is
* called.
*/
- @Ignore
@Test
@SmallTest
public void testRetryOutgoingOriginalConnection_redialTempFailOneSlot() {
@@ -669,7 +651,6 @@
* Verify that the connection is set to disconnected with an error disconnect cause and dial is
* not called.
*/
- @Ignore
@Test
@SmallTest
public void testRetryOutgoingOriginalConnection_redialPermFailOneSlot() {
@@ -703,7 +684,6 @@
* Verify that the emergency call is dialed on the other slot and telecom is notified of the new
* PhoneAccount.
*/
- @Ignore
@Test
@SmallTest
public void testRetryOutgoingOriginalConnection_redialTempFailTwoSlot() {
@@ -745,7 +725,6 @@
* Verify that the emergency call is dialed on the other slot and telecom is notified of the new
* PhoneAccount.
*/
- @Ignore
@Test
@SmallTest
public void testRetryOutgoingOriginalConnection_redialPermFailTwoSlot() {
@@ -787,7 +766,6 @@
* Verify that the emergency call is dialed on slot 1 and then on slot 0 and telecom is
* notified of this twice.
*/
- @Ignore
@Test
@SmallTest
public void testRetryOutgoingOriginalConnection_redialTempFailTwoSlot_twoFailure() {
@@ -843,7 +821,6 @@
* Verify that the emergency call is dialed on slot 1 and then disconnected and telecom is
* notified of the change to slot 1.
*/
- @Ignore
@Test
@SmallTest
public void testRetryOutgoingOriginalConnection_redialPermFailTwoSlot_twoFailure() {
@@ -890,7 +867,6 @@
}
}
- @Ignore
@Test
@SmallTest
public void testSuppServiceNotification() {
diff --git a/tests/src/com/android/services/telephony/TelephonyConnectionTest.java b/tests/src/com/android/services/telephony/TelephonyConnectionTest.java
index 6feefec..7d15680 100644
--- a/tests/src/com/android/services/telephony/TelephonyConnectionTest.java
+++ b/tests/src/com/android/services/telephony/TelephonyConnectionTest.java
@@ -5,16 +5,14 @@
import android.os.Bundle;
import android.telecom.Connection;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
+import androidx.test.runner.AndroidJUnit4;
+
@RunWith(AndroidJUnit4.class)
public class TelephonyConnectionTest {
- @Ignore
@Test
public void testCodecInIms() {
TestTelephonyConnection c = new TestTelephonyConnection();