Split TeleService into a client apk and a lib.
The client apk has the manifest and the lib has the code
and resources. This is being done so that the apk can run
under the phone shareduid, while the lib can be part of telephony
mainline module and be updatable.
Test: basic telephony sanity & atest TeleServiceTests
Test: manually verified that earlier bugs b/146087645, b/146034680,
b/146109167 are not seen
Bug: 144806641
Change-Id: If9f7bd6a50fce2b8e819479c2765240c5292a251
diff --git a/tests/Android.bp b/tests/Android.bp
index 7ed234e..90f9ce7 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -30,7 +30,7 @@
platform_apis: true,
certificate: "platform",
- instrumentation_for: "TeleService",
+ instrumentation_for: "TeleServiceLib",
static_libs: [
"androidx.test.rules",
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index d434650..17f4a8f 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"
+ android:targetPackage="com.android.phone.lib"
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 2061f38..f2bc8d2 100644
--- a/tests/src/com/android/phone/LocationAccessPolicyTest.java
+++ b/tests/src/com/android/phone/LocationAccessPolicyTest.java
@@ -35,6 +35,7 @@
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;
@@ -171,7 +172,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 edfc34f..19e802b 100644
--- a/tests/src/com/android/services/telephony/ImsConferenceControllerTest.java
+++ b/tests/src/com/android/services/telephony/ImsConferenceControllerTest.java
@@ -30,6 +30,7 @@
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;
@@ -109,6 +110,7 @@
* 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 7251402..d294604 100644
--- a/tests/src/com/android/services/telephony/ImsConferenceTest.java
+++ b/tests/src/com/android/services/telephony/ImsConferenceTest.java
@@ -38,6 +38,7 @@
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;
@@ -65,6 +66,7 @@
.thenReturn(null);
}
+ @Ignore
@Test
@SmallTest
public void testSinglePartyEmulation() {
@@ -112,6 +114,7 @@
/**
* Tests CEPs with disconnected participants present with disconnected state.
*/
+ @Ignore
@Test
@SmallTest
public void testDisconnectParticipantViaDisconnectState() {
@@ -175,6 +178,7 @@
/**
* Tests CEPs with removed participants.
*/
+ @Ignore
@Test
@SmallTest
public void testDisconnectParticipantViaRemoval() {
@@ -232,6 +236,7 @@
*
* This test verifies that we can still enter single party emulation in this case.
*/
+ @Ignore
@Test
@SmallTest
public void testSinglePartyEmulationEnterOnDisconnectParticipant() {
@@ -290,6 +295,7 @@
* 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() {
@@ -346,6 +352,7 @@
* Verify that the single party emulate correctly when the conference start with only
* one participant.
*/
+ @Ignore
@Test
@SmallTest
public void testSinglePartyEmulationWithOneParticipantAtBeginning() {
@@ -370,6 +377,7 @@
/**
* Verify that we do not use single party emulation when a sim call manager is in use.
*/
+ @Ignore
@Test
@SmallTest
public void testNoSinglePartyEmulationWithSimCallManager() {
@@ -408,6 +416,7 @@
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 6e11e51..d08f331 100644
--- a/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java
+++ b/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java
@@ -63,6 +63,7 @@
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;
@@ -165,6 +166,7 @@
*
* Result: getFirstPhoneForEmergencyCall returns the default Voice SIM choice.
*/
+ @Ignore
@Test
@SmallTest
public void testDefaultVoiceSimInService() {
@@ -187,6 +189,7 @@
*
* Result: getFirstPhoneForEmergencyCall returns the slot 1 phone
*/
+ @Ignore
@Test
@SmallTest
public void testSlot1EmergencyOnly() {
@@ -209,6 +212,7 @@
*
* Result: getFirstPhoneForEmergencyCall returns the slot 1 phone
*/
+ @Ignore
@Test
@SmallTest
public void testSlot1InService() {
@@ -233,6 +237,7 @@
* 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() {
@@ -263,6 +268,7 @@
* 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() {
@@ -293,6 +299,7 @@
* 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() {
@@ -323,6 +330,7 @@
* 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() {
@@ -352,6 +360,7 @@
* 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() {
@@ -382,6 +391,7 @@
*
* Result: getFirstPhoneForEmergencyCall returns the slot 1 phone because it is more capable
*/
+ @Ignore
@Test
@SmallTest
public void testSlot1HigherCapablity() {
@@ -410,6 +420,7 @@
* Result: getFirstPhoneForEmergencyCall returns the slot 1 phone because it has more
* capabilities.
*/
+ @Ignore
@Test
@SmallTest
public void testSlot1MoreCapabilities() {
@@ -440,6 +451,7 @@
* 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() {
@@ -467,6 +479,7 @@
*
* Result: getFirstPhoneForEmergencyCall returns the slot 0 phone because it is the first slot.
*/
+ @Ignore
@Test
@SmallTest
public void testEqualCapabilityTwoSimsInserted() {
@@ -498,6 +511,7 @@
* Result: getFirstPhoneForEmergencyCall returns the slot 0 phone because it is the only one
* with a SIM inserted
*/
+ @Ignore
@Test
@SmallTest
public void testEqualCapabilitySim0Inserted() {
@@ -529,6 +543,7 @@
* Result: getFirstPhoneForEmergencyCall returns the slot 1 phone because it is the only one
* with a SIM inserted
*/
+ @Ignore
@Test
@SmallTest
public void testEqualCapabilitySim1Inserted() {
@@ -560,6 +575,7 @@
* Result: getFirstPhoneForEmergencyCall returns the slot 1 phone, since it is a higher
* capability
*/
+ @Ignore
@Test
@SmallTest
public void testSim1HigherCapabilityNoSimsInserted() {
@@ -590,6 +606,7 @@
*
* Result: getFirstPhoneForEmergencyCall returns the slot 0 phone, since it is the first slot.
*/
+ @Ignore
@Test
@SmallTest
public void testEqualCapabilityNoSimsInserted() {
@@ -620,6 +637,7 @@
* Verify that dial is called on the same phone again when retryOutgoingOriginalConnection is
* called.
*/
+ @Ignore
@Test
@SmallTest
public void testRetryOutgoingOriginalConnection_redialTempFailOneSlot() {
@@ -651,6 +669,7 @@
* 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() {
@@ -684,6 +703,7 @@
* 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() {
@@ -725,6 +745,7 @@
* 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() {
@@ -766,6 +787,7 @@
* 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() {
@@ -821,6 +843,7 @@
* 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() {
@@ -867,6 +890,7 @@
}
}
+ @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 7d15680..6feefec 100644
--- a/tests/src/com/android/services/telephony/TelephonyConnectionTest.java
+++ b/tests/src/com/android/services/telephony/TelephonyConnectionTest.java
@@ -5,14 +5,16 @@
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();