commit b159d3e95984344b12e97160d9a8a9f535c3ff1b
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Apr 18 20:31:22 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 18 20:31:22 2018 +0000
tree 3a780eb08529a6e5d9c2e59b37fa9292683ca210
parent 22ae35e3745ca4e489d3964aec13e5c49130cd26
parent 1050b07afe6abc7353de7612c8e4e4d085ca7c46

Merge "Fix deadlock during Testing" into pi-dev

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 1502089..957c8d6 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -875,7 +875,9 @@
         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())));
     }
 
     /**