aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMeng Wang <mewan@google.com>2018-04-18 12:29:17 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-04-18 12:29:17 -0700
commit94c212109c82335ada98b8d932bfde2f7d46d7fe (patch)
tree8438a9d9aa85b4a86b96f40d092dd55345e41867
parent30f1c201bf988a18bbf690c37e6772654f088283 (diff)
parent22ae35e3745ca4e489d3964aec13e5c49130cd26 (diff)
downloadims-94c212109c82335ada98b8d932bfde2f7d46d7fe.tar.gz
Merge "setWfcSetting: set WFC mode w.r.t. roaming state" into pi-dev
am: 22ae35e374 Change-Id: Ib07f41ba7de7db3d6341c3fa34b38700401dd765
-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 0e0adfb7..939feffd 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -876,7 +876,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())));
}
/**