aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/java/com/android/internal/telephony/imsphone/ImsPhone.java11
-rw-r--r--tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneTest.java6
2 files changed, 17 insertions, 0 deletions
diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhone.java b/src/java/com/android/internal/telephony/imsphone/ImsPhone.java
index 406d8d08e..97a11d6fd 100644
--- a/src/java/com/android/internal/telephony/imsphone/ImsPhone.java
+++ b/src/java/com/android/internal/telephony/imsphone/ImsPhone.java
@@ -98,6 +98,7 @@ import com.android.internal.telephony.TelephonyComponentFactory;
import com.android.internal.telephony.TelephonyIntents;
import com.android.internal.telephony.TelephonyProperties;
import com.android.internal.telephony.dataconnection.TransportManager;
+import com.android.internal.telephony.emergency.EmergencyNumberTracker;
import com.android.internal.telephony.gsm.GsmMmiCode;
import com.android.internal.telephony.gsm.SuppServiceNotification;
import com.android.internal.telephony.uicc.IccRecords;
@@ -233,6 +234,16 @@ public class ImsPhone extends ImsPhoneBase {
return mCurrentSubscriberUris;
}
+ @Override
+ public EmergencyNumberTracker getEmergencyNumberTracker() {
+ return mDefaultPhone.getEmergencyNumberTracker();
+ }
+
+ @Override
+ public ServiceStateTracker getServiceStateTracker() {
+ return mDefaultPhone.getServiceStateTracker();
+ }
+
// Create Cf (Call forward) so that dialling number &
// mIsCfu (true if reason is call forward unconditional)
// mOnComplete (Message object passed by client) can be packed &
diff --git a/tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneTest.java b/tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneTest.java
index a0c15c91e..5bdc61c15 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneTest.java
@@ -766,6 +766,12 @@ public class ImsPhoneTest extends TelephonyTest {
verify(mImsManager, times(1)).setWfcMode(anyInt(), anyBoolean());
}
+ @Test
+ public void testNonNullTrackersInImsPhone() throws Exception {
+ assertNotNull(mImsPhoneUT.getEmergencyNumberTracker());
+ assertNotNull(mImsPhoneUT.getServiceStateTracker());
+ }
+
private ServiceState getServiceStateDataAndVoice(int rat, int regState, boolean isRoaming) {
ServiceState ss = new ServiceState();
ss.setStateOutOfService();