diff options
| author | Meng Wang <mewan@google.com> | 2016-10-06 11:29:46 -0700 |
|---|---|---|
| committer | Meng Wang <mewan@google.com> | 2016-10-06 11:29:46 -0700 |
| commit | 531a8b68b40cfbc48229dfb11814e7fd5a520563 (patch) | |
| tree | f7e58cedbb48b62cee8a387929d4b14dd281c182 | |
| parent | 374770193cd3bffaad44551e8d9621f0abfa367d (diff) | |
| download | ims-531a8b68b40cfbc48229dfb11814e7fd5a520563.tar.gz | |
ImsManager: updateWfcFeatureAndProvisionedValues use roaming statenougat-mr1-dev
In updateImsServiceConfig, WFC should be updated according to roaming
state. Roaming-aware version of getWfcMode() should be used.
Bug: 31972897
Change-Id: Ic4d6a516373d6ccdadad4fd43ed9e092d8ef72a6
| -rw-r--r-- | src/java/com/android/ims/ImsManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java index 5630af1e..6d8cef60 100644 --- a/src/java/com/android/ims/ImsManager.java +++ b/src/java/com/android/ims/ImsManager.java @@ -820,9 +820,10 @@ public class ImsManager { * @throws ImsException */ private boolean updateWfcFeatureAndProvisionedValues() throws ImsException { + boolean isNetworkRoaming = TelephonyManager.getDefault().isNetworkRoaming(); boolean available = isWfcEnabledByPlatform(mContext); boolean enabled = isWfcEnabledByUser(mContext); - int mode = getWfcMode(mContext); + int mode = getWfcMode(mContext, isNetworkRoaming); boolean roaming = isWfcRoamingEnabledByUser(mContext); boolean isFeatureOn = available && enabled; |