diff options
| author | Meng Wang <mewan@google.com> | 2018-04-17 11:27:21 -0700 |
|---|---|---|
| committer | Brad Ebinger <breadley@google.com> | 2018-05-22 21:11:11 +0000 |
| commit | 2c2f0937758a663122bc3843bb16906458393a5b (patch) | |
| tree | 1b2528565fe8906d3c750d8c21f4b5abdf028126 | |
| parent | f3ee4138f61e2610c2728c1c63d3ebeff61ab8cb (diff) | |
| download | ims-2c2f0937758a663122bc3843bb16906458393a5b.tar.gz | |
setWfcSetting: set WFC mode w.r.t. roaming state
When turing on WFC, WFC mode in modem should also be updated
to user set WFC mode: roaming mode if in roaming network or
home mode otherwise.
The code was using home mode always; so it causes user setting
mismatch with modem setting in roaming, if home mode is different
from roaming mode.
Bug: 77882002
Test: manual - force device in roaming state, and turn on WFC;
verify that modem uses roaming mode not home mode.
Change-Id: I510aa469736de7a9262a87ec6399f5ca97cb3af1
Merged-In: I510aa469736de7a9262a87ec6399f5ca97cb3af1
| -rw-r--r-- | src/java/com/android/ims/ImsManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java index c49795ac..bcba4fcc 100644 --- a/src/java/com/android/ims/ImsManager.java +++ b/src/java/com/android/ims/ImsManager.java @@ -872,7 +872,9 @@ public class ImsManager { SubscriptionManager.setSubscriptionProperty(getSubId(), SubscriptionManager.WFC_IMS_ENABLED, booleanToPropertyString(enabled)); - setWfcNonPersistent(enabled, getWfcMode()); + TelephonyManager tm = (TelephonyManager) + mContext.getSystemService(Context.TELEPHONY_SERVICE); + setWfcNonPersistent(enabled, getWfcMode(tm.isNetworkRoaming(getSubId()))); } /** |