Merge "EmergencyNumberTracker and ServiceStateTracker fetched by ImsPhone" into qt-dev (29a1cf04) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/imsphone/ImsPhone.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -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 &

+6 −0

Original line number	Diff line number	Diff line
		@@ -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();