diff options
| author | Brad Ebinger <breadley@google.com> | 2019-02-14 21:01:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-02-14 21:01:05 +0000 |
| commit | 6dec24ebab3a4c7474648c772f4ae0eb9617b511 (patch) | |
| tree | 909708dacce9e43c05fb6daed73f9ffa866be7b4 | |
| parent | 0a0131e731b27bba4d026f86c8a16ca745fde2e4 (diff) | |
| parent | 1746f069f76056c3539e88a6c8aadcbce20b5238 (diff) | |
| download | ims-6dec24ebab3a4c7474648c772f4ae0eb9617b511.tar.gz | |
Merge "Prevents violation of ims provisioning policy"
| -rw-r--r-- | src/java/com/android/ims/ImsManager.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java index b73829aa..073b5f96 100644 --- a/src/java/com/android/ims/ImsManager.java +++ b/src/java/com/android/ims/ImsManager.java @@ -504,6 +504,10 @@ public class ImsManager { * {@link CarrierConfigManager#KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL}. */ public void setEnhanced4gLteModeSetting(boolean enabled) { + if (enabled && !isVolteProvisionedOnDevice()) { + log("setEnhanced4gLteModeSetting: Not possible to enable VoLTE due to provisioning."); + return; + } int subId = getSubId(); // If editable=false or hidden=true, we must keep default advanced 4G mode. if (!getBooleanCarrierConfig(CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL) || @@ -795,6 +799,11 @@ public class ImsManager { * Change persistent VT enabled setting for slot. */ public void setVtSetting(boolean enabled) { + if (enabled && !isVtProvisionedOnDevice()) { + log("setVtSetting: Not possible to enable Vt due to provisioning."); + return; + } + int subId = getSubId(); if (isSubIdValid(subId)) { SubscriptionManager.setSubscriptionProperty(subId, SubscriptionManager.VT_IMS_ENABLED, @@ -912,6 +921,11 @@ public class ImsManager { * Change persistent WFC enabled setting for slot. */ public void setWfcSetting(boolean enabled) { + if (enabled && !isWfcProvisionedOnDevice()) { + log("setWfcSetting: Not possible to enable WFC due to provisioning."); + return; + } + int subId = getSubId(); if (isSubIdValid(subId)) { SubscriptionManager.setSubscriptionProperty(subId, SubscriptionManager.WFC_IMS_ENABLED, |