Merge "IMS: De-registration happens when modem comes up from low power mode." (ce0d687b) · Commits · e / os / android_frameworks_opt_telephony

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

+9 −4

Original line number	Diff line number	Diff line
		@@ -84,6 +84,7 @@ import com.android.internal.telephony.CommandsInterface;
		import com.android.internal.telephony.Connection;
		import com.android.internal.telephony.Phone;
		import com.android.internal.telephony.PhoneConstants;
		import com.android.internal.telephony.SubscriptionController;
		import com.android.internal.telephony.TelephonyProperties;
		import com.android.internal.telephony.dataconnection.DataEnabledSettings;
		import com.android.internal.telephony.gsm.SuppServiceNotification;
		@@ -221,7 +222,6 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		log("onReceive : Updating mAllowEmergencyVideoCalls = " +
		mAllowEmergencyVideoCalls);
		}
		mCarrierConfigLoaded = true;
		} else if (TelecomManager.ACTION_CHANGE_DEFAULT_DIALER.equals(intent.getAction())) {
		mDefaultDialerUid.set(getPackageUid(context, intent.getStringExtra(
		TelecomManager.EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME)));
		@@ -995,16 +995,21 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		private void cacheCarrierConfiguration(int subId) {
		CarrierConfigManager carrierConfigManager = (CarrierConfigManager)
		mPhone.getContext().getSystemService(Context.CARRIER_CONFIG_SERVICE);
		if (carrierConfigManager == null) {
		loge("cacheCarrierConfiguration: No carrier config service found.");
		if (carrierConfigManager == null
		\|\| !SubscriptionController.getInstance().isActiveSubId(subId)) {
		loge("cacheCarrierConfiguration: No carrier config service found" + " "
		+ "or not active subId = " + subId);
		mCarrierConfigLoaded = false;
		return;
		}

		PersistableBundle carrierConfig = carrierConfigManager.getConfigForSubId(subId);
		if (carrierConfig == null) {
		loge("cacheCarrierConfiguration: Empty carrier config.");
		mCarrierConfigLoaded = false;
		return;
		}
		mCarrierConfigLoaded = true;

		mAllowEmergencyVideoCalls =
		carrierConfig.getBoolean(CarrierConfigManager.KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL);
		@@ -3477,7 +3482,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		// We do not want to update the ImsConfig for REASON_REGISTERED, since it can happen before
		// the carrier config has loaded and will deregister IMS.
		if (!mShouldUpdateImsConfigOnDisconnect
		&& reason != DataEnabledSettings.REASON_REGISTERED) {
		&& reason != DataEnabledSettings.REASON_REGISTERED && mCarrierConfigLoaded) {
		// This will call into updateVideoCallFeatureValue and eventually all clients will be
		// asynchronously notified that the availability of VT over LTE has changed.
		if (mImsManager != null) {