diff options
| author | Meng Wang <mewan@google.com> | 2016-11-23 00:29:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-11-23 00:29:28 +0000 |
| commit | e86c5833f254d46ff1fb825f182891924b912a44 (patch) | |
| tree | 64db2c0378440d50eebaed2da557c7f42abbf6eb | |
| parent | 5778185cdc711ba3c12cf96724dfeb108f47cf47 (diff) | |
| parent | 663aa12c70cf1e3a66d2328fb8e437c8ea321bf2 (diff) | |
| download | ims-e86c5833f254d46ff1fb825f182891924b912a44.tar.gz | |
Merge "ImsManager: check roaming status in setWfcSetting" into nyc-mr2-dev
| -rw-r--r-- | src/java/com/android/ims/ImsManager.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java index aeb7ae68..464aeed2 100644 --- a/src/java/com/android/ims/ImsManager.java +++ b/src/java/com/android/ims/ImsManager.java @@ -445,9 +445,12 @@ public class ImsManager { 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); |