commit dad940f3eeade411178c55eaed1fd10b1c4c9499
author Meng Wang <mewan@google.com> Thu Oct 06 11:29:46 2016 -0700
committer gitbuildkicker <android-build@google.com> Thu Oct 06 16:26:56 2016 -0700
tree f7e58cedbb48b62cee8a387929d4b14dd281c182
parent 637dfd5e638e9b2d86029c8799d19efa2c55bc36

ImsManager: updateWfcFeatureAndProvisionedValues use roaming state

In updateImsServiceConfig, WFC should be updated according to roaming
state. Roaming-aware version of getWfcMode() should be used.

Bug: 31972897
Change-Id: Ic4d6a516373d6ccdadad4fd43ed9e092d8ef72a6
(cherry picked from commit 531a8b68b40cfbc48229dfb11814e7fd5a520563)

src/java/com/android/ims/ImsManager.java

diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java
index 5630af1..6d8cef6 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -820,9 +820,10 @@
      * @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;