commit caeb371148f43d1076229d493bf1114c32e0e1f0
author Etan Cohen <etancohen@google.com> Thu Aug 21 14:56:53 2014 -0700
committer Etan Cohen <etancohen@google.com> Fri Aug 22 19:04:31 2014 +0000
tree ab1069c1112c43753cbfe36d9178e06facc9d420
parent b54eddf524ff481844df5b68517e492390559c57

Guarantee that Enhanced 4G LTE Mode setting is applied.

Possible race condition if IMS Manager not able to be instantiated.

Bug: 17186613
Change-Id: I376d3cb2c2950a0bd72ad804d51767415839ec6d

src/com/android/phone/MobileNetworkSettings.java

diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index 89749ad..05c00fa 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -488,13 +488,14 @@
                         .obtainMessage(MyHandler.MESSAGE_SET_PREFERRED_NETWORK_TYPE));
             }
         } else if (preference == mButton4glte) {
+            SwitchPreference ltePref = (SwitchPreference)preference;
+            ltePref.setChecked(!ltePref.isChecked());
+            setIMS(ltePref.isChecked());
+
             ImsManager imsMan = ImsManager.getInstance(getBaseContext(),
                     SubscriptionManager.getDefaultVoiceSubId());
-            SwitchPreference ltePref = (SwitchPreference)preference;
-
             if (imsMan != null) {
-                ltePref.setChecked(!ltePref.isChecked());
-                setIMS(ltePref.isChecked());
+
                 try {
                     imsMan.setAdvanced4GMode(ltePref.isChecked());
                 } catch (ImsException ie) {