Merge "Pass in multiple device/carrier configurations into ImsResolver" (00c05fe1) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/PhoneFactory.java

+1 −29

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@ import com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager;
		import com.android.internal.telephony.dataconnection.TelephonyNetworkFactory;
		import com.android.internal.telephony.euicc.EuiccCardController;
		import com.android.internal.telephony.euicc.EuiccController;
		import com.android.internal.telephony.ims.ImsResolver;
		import com.android.internal.telephony.imsphone.ImsPhone;
		import com.android.internal.telephony.imsphone.ImsPhoneFactory;
		import com.android.internal.telephony.sip.SipPhone;
		@@ -92,7 +91,6 @@ public class PhoneFactory {
		static private PhoneConfigurationManager sPhoneConfigurationManager;
		static private PhoneSwitcher sPhoneSwitcher;
		static private TelephonyNetworkFactory[] sTelephonyNetworkFactories;
		static private ImsResolver sImsResolver;
		static private NotificationChannelController sNotificationChannelController;
		static private CellularNetworkValidator sCellularNetworkValidator;

		@@ -213,17 +211,9 @@ public class PhoneFactory {
		// Only bring up IMS if the device supports having an IMS stack.
		if (context.getPackageManager().hasSystemFeature(
		PackageManager.FEATURE_TELEPHONY_IMS)) {
		// Get the package name of the default IMS implementation.
		String defaultImsPackage = sContext.getResources().getString(
		com.android.internal.R.string.config_ims_package);
		// Start ImsResolver and bind to ImsServices.
		Rlog.i(LOG_TAG, "ImsResolver: defaultImsPackage: " + defaultImsPackage);
		sImsResolver = new ImsResolver(sContext, defaultImsPackage, numPhones);
		sImsResolver.initialize();
		// Start monitoring after defaults have been made.
		// Default phone must be ready before ImsPhone is created because ImsService
		// might need it when it is being opened. This should initialize multiple
		// ImsPhones for ImsResolver implementations of ImsService.
		// might need it when it is being opened.
		for (int i = 0; i < numPhones; i++) {
		sPhones[i].createImsPhone();
		}
		@@ -354,14 +344,6 @@ public class PhoneFactory {
		return sSubInfoRecordUpdater;
		}

		/**
		* @return The ImsResolver instance or null if IMS is not supported
		* (FEATURE_TELEPHONY_IMS is not defined).
		*/
		public static @Nullable ImsResolver getImsResolver() {
		return sImsResolver;
		}

		/**
		* Get the network factory associated with a given phone ID.
		* @param phoneId the phone id
		@@ -561,16 +543,6 @@ public class PhoneFactory {
		pw.println("++++++++++++++++++++++++++++++++");
		}

		pw.println("ImsResolver:");
		pw.increaseIndent();
		try {
		if (sImsResolver != null) sImsResolver.dump(fd, pw, args);
		} catch (Exception e) {
		e.printStackTrace();
		}
		pw.decreaseIndent();
		pw.println("++++++++++++++++++++++++++++++++");

		pw.println("UiccController:");
		pw.increaseIndent();
		try {

src/java/com/android/internal/telephony/ims/ImsResolver.java

+238 −111

File changed.

Preview size limit exceeded, changes collapsed.

src/java/com/android/internal/telephony/ims/ImsServiceFeatureQueryManager.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,21 @@ public class ImsServiceFeatureQueryManager {
		Log.w(LOG_TAG, "onServiceDisconnected for component: " + name);
		}

		@Override
		public void onBindingDied(ComponentName name) {
		Log.w(LOG_TAG, "onBindingDied: " + name);
		cleanup();
		// retry again!
		mListener.onError(name);
		}

		@Override
		public void onNullBinding(ComponentName name) {
		Log.w(LOG_TAG, "onNullBinding: " + name);
		cleanup();
		mListener.onPermanentError(name);
		}

		private void queryImsFeatures(IImsServiceController controller) {
		ImsFeatureConfiguration config;
		try {
		@@ -90,6 +105,7 @@ public class ImsServiceFeatureQueryManager {
		} catch (Exception e) {
		Log.w(LOG_TAG, "queryImsFeatures - error: " + e);
		cleanup();
		// Retry again!
		mListener.onError(mName);
		return;
		}

tests/telephonytests/src/com/android/internal/telephony/ims/ImsResolverTest.java

+702 −67

File changed.

Preview size limit exceeded, changes collapsed.