aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-04-18 18:55:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-04-18 18:55:38 +0000
commit22ae35e3745ca4e489d3964aec13e5c49130cd26 (patch)
treecaaefb9e18e9175e1744e398fde051d8374fdd69
parentb19b283163202f78946e9a2e7a322ad826a0fc81 (diff)
parenteba31e19e041fff22c7fa70aaec8a0e5daadc374 (diff)
downloadims-22ae35e3745ca4e489d3964aec13e5c49130cd26.tar.gz
Merge "setWfcSetting: set WFC mode w.r.t. roaming state" into pi-dev
-rw-r--r--src/java/com/android/ims/ImsManager.java4
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 1502089c..957c8d67 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -875,7 +875,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())));
}
/**