commit 9e6eca2d0ceef9edc401c66783bca3a57547b727
author Pavel Zhamaitsiak <pavelz@google.com> Mon Mar 16 15:30:53 2015 -0700
committer Pavel Zhamaitsiak <pavelz@google.com> Mon Mar 16 17:03:53 2015 -0700
tree 61d2a8f020f50f0bb351ec2ec57ef6b0515cda47
parent bb14f74aaa122714acdd51ce9e8e4192e3fb7e36

Force IMS to register over LTE when turning off WFC

Bug: 19697174
Change-Id: I4b1538052f4bc2bf5d7c55f78467c6c52b49efd8

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 5443533..ed1a43a 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -324,6 +324,11 @@
                     log("setWfcSetting() : imsServiceAllowTurnOff -> turnOffIms");
                     imsManager.turnOffIms();
                 }
+
+                // Force IMS to register over LTE when turning off WFC
+                setWfcModeInternal(context, enabled
+                        ? getWfcMode(context)
+                        : ImsConfig.WfcModeFeatureValueConstants.CELLULAR_PREFERRED);
             } catch (ImsException e) {
                 loge("setWfcSetting(): " + e);
             }
@@ -349,6 +354,10 @@
         android.provider.Settings.Global.putInt(context.getContentResolver(),
                 android.provider.Settings.Global.WFC_IMS_MODE, wfcMode);
 
+        setWfcModeInternal(context, wfcMode);
+    }
+
+    private static void setWfcModeInternal(Context context, int wfcMode) {
         final ImsManager imsManager = ImsManager.getInstance(context,
                 SubscriptionManager.getDefaultVoicePhoneId());
         if (imsManager != null) {