commit e76b88dbdeba049d9a7f24a79cd7d58d3250ea7a
author Etan Cohen <etancohen@google.com> Fri Aug 08 16:00:20 2014 -0700
committer Etan Cohen <etancohen@google.com> Mon Aug 11 08:30:05 2014 -0700
tree fc106a82c790a637b863961733c937c9c3905d4a
parent a5cd6c840766ca3e54d8292db4a03ac16a30ff09

Modify Advanced 4G Option to call new API in ImsManager.

Additionally: changed logic so that setting always succeeds whether or
not ImsManager call succeeded.

Change-Id: I2fdb6798f2beaf0fafbb838d5c59e691e21d3ed6

src/com/android/phone/MobileNetworkSettings.java

diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index d077aa8..f5f64af 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -490,20 +490,13 @@
             SwitchPreference ltePref = (SwitchPreference)preference;
 
             if (imsMan != null) {
-                try {
-                    if (ltePref.isChecked()) {
-                        imsMan.turnOffIms();
-                    } else {
-                        imsMan.turnOnIms();
-                    }
-                } catch(ImsException ie) {
-                    ltePref.setChecked(ltePref.isChecked());
-                    return false;
-                }
                 ltePref.setChecked(!ltePref.isChecked());
                 setIMS(ltePref.isChecked());
-            } else {
-                ltePref.setChecked(false);
+                try {
+                    imsMan.setAdvanced4GMode(ltePref.isChecked());
+                } catch (ImsException ie) {
+                    // do nothing
+                }
             }
         } else if (preference == mButtonDataRoam) {
             if (DBG) log("onPreferenceTreeClick: preference == mButtonDataRoam.");