Merge "Integrates ImsResolver into telephony" (84869eee) · Commits · e / os / android_frameworks_opt_telephony

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ import android.util.LocalLog;

		import com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager;
		import com.android.internal.telephony.dataconnection.TelephonyNetworkFactory;
		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;
		@@ -78,6 +79,7 @@ public class PhoneFactory {
		static private PhoneSwitcher sPhoneSwitcher;
		static private SubscriptionMonitor sSubscriptionMonitor;
		static private TelephonyNetworkFactory[] sTelephonyNetworkFactories;
		static private ImsResolver sImsResolver;

		static private final HashMap<String, LocalLog>sLocalLogs = new HashMap<String, LocalLog>();

		@@ -228,6 +230,11 @@ public class PhoneFactory {
		sPhoneSwitcher, sc, sSubscriptionMonitor, Looper.myLooper(),
		sContext, i, sPhones[i].mDcTracker);
		}
		String defaultImsPackage = sContext.getResources().getString(
		com.android.internal.R.string.config_ims_package);
		Rlog.i(LOG_TAG, "ImsResolver: defaultImsPackage: " + defaultImsPackage);
		sImsResolver = new ImsResolver(sContext, defaultImsPackage, numPhones);
		sImsResolver.populateCacheAndStartBind();
		}
		}
		}
		@@ -275,6 +282,10 @@ public class PhoneFactory {
		}
		}

		public static ImsResolver getImsResolver() {
		return sImsResolver;
		}

		/**
		* Makes a {@link SipPhone} object.
		* @param sipUri the local SIP URI the phone runs on