commit 28831575b3c3fe44b21b1cc66c6524a297005b19
author Meng Wang <mewan@google.com> Wed Nov 23 00:38:41 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 23 00:38:41 2016 +0000
tree 4f864ab9f0f30488eb5aef7636f3fee14e8ea966
parent cfd2c55e01f5e19d48b60ae2c3ae10002bf6f364
parent ec69f5cfe8d646df75cd621d48bbfd35573d724a

ImsManager: check roaming status in setWfcSetting am: 663aa12c70
am: ec69f5cfe8

Change-Id: I8cd387ff5a836f439ea59965432e1cb779db1468

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 aeb7ae6..464aeed 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -445,9 +445,12 @@
                     imsManager.turnOffIms();
                 }
 
-                // Force IMS to register over LTE when turning off WFC
+                TelephonyManager tm = (TelephonyManager) context
+                        .getSystemService(Context.TELEPHONY_SERVICE);
                 setWfcModeInternal(context, enabled
-                        ? getWfcMode(context)
+                        // Choose wfc mode per current roaming preference
+                        ? getWfcMode(context, tm.isNetworkRoaming())
+                        // Force IMS to register over LTE when turning off WFC
                         : ImsConfig.WfcModeFeatureValueConstants.CELLULAR_PREFERRED);
             } catch (ImsException e) {
                 loge("setWfcSetting(): ", e);