Revert "Split TeleService into a client apk and a lib."
This reverts commit 35e5fcb1b2a22706ebf7e0369bc8668e32d4d4f6.
Reason for revert: b/146034680 - cause is that resource overlays are not working.
Bug: 146034680
Bug: 144806641
Change-Id: Iaf897c2b38c92b1c9be74c9705520f462d58785b
diff --git a/tests/Android.bp b/tests/Android.bp
index de44863..22b40b5 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -29,7 +29,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 cd7a580..6e11e51 100644
--- a/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java
+++ b/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java
@@ -651,7 +651,6 @@
* Verify that the connection is set to disconnected with an error disconnect cause and dial is
* not called.
*/
-
@Test
@SmallTest
public void testRetryOutgoingOriginalConnection_redialPermFailOneSlot() {
diff --git a/tests/src/com/android/services/telephony/TelephonyConnectionTest.java b/tests/src/com/android/services/telephony/TelephonyConnectionTest.java
index cfc0ccc..7d15680 100644
--- a/tests/src/com/android/services/telephony/TelephonyConnectionTest.java
+++ b/tests/src/com/android/services/telephony/TelephonyConnectionTest.java
@@ -5,11 +5,11 @@
import android.os.Bundle;
import android.telecom.Connection;
-import androidx.test.runner.AndroidJUnit4;
-
import org.junit.Test;
import org.junit.runner.RunWith;
+import androidx.test.runner.AndroidJUnit4;
+
@RunWith(AndroidJUnit4.class)
public class TelephonyConnectionTest {