Merge changes from topics "cp_rm_dyn_ims_config", "support_multiple_bind_ims" (0dcf6924) · Commits · e / os / android_frameworks_opt_telephony

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

+8 −74

Original line number	Diff line number	Diff line
		@@ -19,10 +19,8 @@ package com.android.internal.telephony;
		import android.annotation.Nullable;
		import android.annotation.UnsupportedAppUsage;
		import android.app.BroadcastOptions;
		import android.content.BroadcastReceiver;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.SharedPreferences;
		import android.net.LinkProperties;
		import android.net.NetworkCapabilities;
		@@ -116,33 +114,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {

		protected final int USSD_MAX_QUEUE = 10;

		private BroadcastReceiver mImsIntentReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		Rlog.d(LOG_TAG, "mImsIntentReceiver: action " + intent.getAction());
		if (intent.hasExtra(ImsManager.EXTRA_PHONE_ID)) {
		int extraPhoneId = intent.getIntExtra(ImsManager.EXTRA_PHONE_ID,
		SubscriptionManager.INVALID_PHONE_INDEX);
		Rlog.d(LOG_TAG, "mImsIntentReceiver: extraPhoneId = " + extraPhoneId);
		if (extraPhoneId == SubscriptionManager.INVALID_PHONE_INDEX \|\|
		extraPhoneId != getPhoneId()) {
		return;
		}
		}

		synchronized (Phone.lockForRadioTechnologyChange) {
		if (intent.getAction().equals(ImsManager.ACTION_IMS_SERVICE_UP)) {
		mImsServiceReady = true;
		updateImsPhone();
		ImsManager.getInstance(mContext, mPhoneId).updateImsServiceConfig(false);
		} else if (intent.getAction().equals(ImsManager.ACTION_IMS_SERVICE_DOWN)) {
		mImsServiceReady = false;
		updateImsPhone();
		}
		}
		}
		};

		// Key used to read and write the saved network selection numeric value
		public static final String NETWORK_SELECTION_KEY = "network_selection_key";
		// Key used to read and write the saved network selection operator name
		@@ -323,7 +294,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		@UnsupportedAppUsage
		protected int mPhoneId;

		private boolean mImsServiceReady = false;
		@UnsupportedAppUsage
		protected Phone mImsPhone = null;

		@@ -586,34 +556,20 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		}

		/**
		* Start listening for IMS service UP/DOWN events. If using the new ImsResolver APIs, we should
		* always be setting up ImsPhones.
		* Start setup of ImsPhone, which will start trying to connect to the ImsResolver. Will not be
		* called if this device does not support FEATURE_IMS_TELEPHONY.
		*/
		public void startMonitoringImsService() {
		public void createImsPhone() {
		if (getPhoneType() == PhoneConstants.PHONE_TYPE_SIP) {
		return;
		}

		synchronized(Phone.lockForRadioTechnologyChange) {
		IntentFilter filter = new IntentFilter();
		ImsManager imsManager = ImsManager.getInstance(mContext, getPhoneId());
		// Don't listen to deprecated intents using the new dynamic binding.
		if (imsManager != null && !imsManager.isDynamicBinding()) {
		filter.addAction(ImsManager.ACTION_IMS_SERVICE_UP);
		filter.addAction(ImsManager.ACTION_IMS_SERVICE_DOWN);
		mContext.registerReceiver(mImsIntentReceiver, filter);
		}

		// Monitor IMS service - but first poll to see if already up (could miss
		// intent). Also, when using new ImsResolver APIs, the service will be available soon,
		// so start trying to bind.
		if (imsManager != null) {
		// If it is dynamic binding, kick off ImsPhone creation now instead of waiting for
		// the service to be available.
		if (imsManager.isDynamicBinding() \|\| imsManager.isServiceAvailable()) {
		mImsServiceReady = true;
		updateImsPhone();
		}
		if (mImsPhone == null) {
		mImsPhone = PhoneFactory.makeImsPhone(mNotifier, this);
		CallManager.getInstance().registerPhone(mImsPhone);
		mImsPhone.registerForSilentRedial(
		this, EVENT_INITIATE_SILENT_REDIAL, null);
		}
		}
		}
		@@ -3461,28 +3417,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		public void dispose() {
		}

		private void updateImsPhone() {
		Rlog.d(LOG_TAG, "updateImsPhone"
		+ " mImsServiceReady=" + mImsServiceReady);

		if (mImsServiceReady && (mImsPhone == null)) {
		mImsPhone = PhoneFactory.makeImsPhone(mNotifier, this);
		CallManager.getInstance().registerPhone(mImsPhone);
		mImsPhone.registerForSilentRedial(
		this, EVENT_INITIATE_SILENT_REDIAL, null);
		} else if (!mImsServiceReady && (mImsPhone != null)) {
		CallManager.getInstance().unregisterPhone(mImsPhone);
		mImsPhone.unregisterForSilentRedial(this);

		mImsPhone.dispose();
		// Potential GC issue if someone keeps a reference to ImsPhone.
		// However: this change will make sure that such a reference does
		// not access functions through NULL pointer.
		//mImsPhone.removeReferences();
		mImsPhone = null;
		}
		}

		/**
		* Dials a number.
		*

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

+3 −8

Original line number	Diff line number	Diff line
		@@ -211,24 +211,19 @@ public class PhoneFactory {
		// Only bring up IMS if the device supports having an IMS stack.
		if (context.getPackageManager().hasSystemFeature(
		PackageManager.FEATURE_TELEPHONY_IMS)) {
		// Return whether or not the device should use dynamic binding or the static
		// implementation (deprecated)
		boolean isDynamicBinding = sContext.getResources().getBoolean(
		com.android.internal.R.bool.config_dynamic_bind_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,
		isDynamicBinding);
		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.
		for (int i = 0; i < numPhones; i++) {
		sPhones[i].startMonitoringImsService();
		sPhones[i].createImsPhone();
		}
		} else {
		Rlog.i(LOG_TAG, "IMS is not supported on this device, skipping ImsResolver.");
		@@ -284,7 +279,7 @@ public class PhoneFactory {
		sPhones[i] = createPhone(context, i);
		if (context.getPackageManager().hasSystemFeature(
		PackageManager.FEATURE_TELEPHONY_IMS)) {
		sPhones[i].startMonitoringImsService();
		sPhones[i].createImsPhone();
		}
		sTelephonyNetworkFactories[i] = new TelephonyNetworkFactory(
		Looper.myLooper(), sPhones[i]);