diff options
| -rw-r--r-- | res/values-mcc310-mnc410/config.xml | 3 | ||||
| -rwxr-xr-x | res/values-mcc311-mnc480/config.xml | 1 | ||||
| -rwxr-xr-x | res/values/config.xml | 3 | ||||
| -rw-r--r-- | src/com/android/phone/PhoneGlobals.java | 4 | ||||
| -rw-r--r-- | src/com/android/services/telephony/TelecomAccountRegistry.java | 11 |
5 files changed, 10 insertions, 12 deletions
diff --git a/res/values-mcc310-mnc410/config.xml b/res/values-mcc310-mnc410/config.xml index bf89c3456..7dd16b1e7 100644 --- a/res/values-mcc310-mnc410/config.xml +++ b/res/values-mcc310-mnc410/config.xml @@ -16,5 +16,4 @@ --> <resources> - <bool name="support_pause_ims_video_calls" translatable="false">false</bool> -</resources>
\ No newline at end of file +</resources> diff --git a/res/values-mcc311-mnc480/config.xml b/res/values-mcc311-mnc480/config.xml index b7d0d6ef5..5cae0bc3a 100755 --- a/res/values-mcc311-mnc480/config.xml +++ b/res/values-mcc311-mnc480/config.xml @@ -23,5 +23,4 @@ <!-- Determine whether the voicemail notification is persistent in the notification bar. If true, the voicemail notifications cannot be dismissed from the notification bar. --> <bool name="voicemail_notification_persistent">true</bool> - <bool name="support_pause_ims_video_calls" translatable="false">true</bool> </resources> diff --git a/res/values/config.xml b/res/values/config.xml index 61af525f9..3df92f8ad 100755 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -157,9 +157,6 @@ If true, the voicemail notifications cannot be dismissed from the notification bar. --> <bool name="voicemail_notification_persistent">false</bool> - <!-- For IMS video over LTE calls, determines whether video pause signalling is supported. --> - <bool name="support_pause_ims_video_calls" translatable="false">true</bool> - <!-- Disables dialing "*228" (OTASP provisioning) on CDMA carriers where it is not supported or is potentially harmful by locking the SIM to 3G. --> <string name="config_disable_cdma_activation_code" translatable="false">false</string> diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java index eb9ea156b..4fca2eacc 100644 --- a/src/com/android/phone/PhoneGlobals.java +++ b/src/com/android/phone/PhoneGlobals.java @@ -513,11 +513,11 @@ public class PhoneGlobals extends ContextWrapper { return mCM; } - /* package */ PersistableBundle getCarrierConfig() { + public PersistableBundle getCarrierConfig() { return getCarrierConfigForSubId(SubscriptionManager.getDefaultSubId()); } - /* package */ PersistableBundle getCarrierConfigForSubId(int subId) { + public PersistableBundle getCarrierConfigForSubId(int subId) { return configLoader.getConfigForSubId(subId); } diff --git a/src/com/android/services/telephony/TelecomAccountRegistry.java b/src/com/android/services/telephony/TelecomAccountRegistry.java index eab1ced7e..df458fd1d 100644 --- a/src/com/android/services/telephony/TelecomAccountRegistry.java +++ b/src/com/android/services/telephony/TelecomAccountRegistry.java @@ -27,9 +27,11 @@ import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; import android.net.Uri; +import android.os.PersistableBundle; import android.telecom.PhoneAccount; import android.telecom.PhoneAccountHandle; import android.telecom.TelecomManager; +import android.telephony.CarrierConfigManager; import android.telephony.PhoneStateListener; import android.telephony.ServiceState; import android.telephony.SubscriptionInfo; @@ -232,10 +234,11 @@ final class TelecomAccountRegistry { configuration.mnc = subscriptionInfo.getMnc(); } - // Load the MNC/MCC specific configuration. - Context subContext = mContext.createConfigurationContext(configuration); - mIsVideoPauseSupported = subContext.getResources().getBoolean( - R.bool.support_pause_ims_video_calls); + // Check if IMS video pause is supported. + PersistableBundle b = + PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId()); + mIsVideoPauseSupported + = b.getBoolean(CarrierConfigManager.KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL); } /** |