diff options
| author | Shareef Ali <shareefalis@cyanogenmod.org> | 2013-07-11 11:33:14 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-07-11 11:33:14 -0700 |
| commit | 6cc153ed6bea3b819d8b3d2b41770518cecb85f2 (patch) | |
| tree | d953dcb3fb9b71ecacd96e6231ea6b190033600b | |
| parent | b7abe4eecf521ec79c0797cfa8ea67e4505a97c4 (diff) | |
| parent | 47712d0494460cb14a710728aeafefeb62edcc38 (diff) | |
| download | frameworks_opt_telephony-6cc153ed6bea3b819d8b3d2b41770518cecb85f2.zip frameworks_opt_telephony-6cc153ed6bea3b819d8b3d2b41770518cecb85f2.tar.gz frameworks_opt_telephony-6cc153ed6bea3b819d8b3d2b41770518cecb85f2.tar.bz2 | |
Merge "Revert "PhoneProxy: when using v6 or greater ril make sure current phone type isnt GSM"" into cm-10.1
| -rw-r--r-- | src/java/com/android/internal/telephony/PhoneProxy.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/java/com/android/internal/telephony/PhoneProxy.java b/src/java/com/android/internal/telephony/PhoneProxy.java index a1a8d88..38fe68d 100644 --- a/src/java/com/android/internal/telephony/PhoneProxy.java +++ b/src/java/com/android/internal/telephony/PhoneProxy.java @@ -31,7 +31,6 @@ import android.telephony.CellInfo; import android.telephony.CellLocation; import android.telephony.ServiceState; import android.telephony.SignalStrength; -import android.telephony.TelephonyManager; import android.util.Log; import com.android.internal.telephony.cdma.CDMAPhone; @@ -56,6 +55,8 @@ public class PhoneProxy extends Handler implements Phone { private boolean mResetModemOnRadioTechnologyChange = false; private int mRilVersion; + private boolean mRilV7NeedsCDMALTEPhone = SystemProperties.getBoolean( + "telephony.rilV7NeedCDMALTEPhone", false); private static final int EVENT_VOICE_RADIO_TECH_CHANGED = 1; private static final int EVENT_RADIO_ON = 2; @@ -147,10 +148,10 @@ public class PhoneProxy extends Handler implements Phone { private void updatePhoneObject(int newVoiceRadioTech) { if (mActivePhone != null) { - int phoneType = TelephonyManager.getPhoneType(TelephonyManager.getDefault().getNetworkType()); - if(mRilVersion >= 6 && getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE && phoneType != PhoneConstants.PHONE_TYPE_GSM) { + if((mRilVersion == 6 && getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE) || + mRilV7NeedsCDMALTEPhone) { /* - * On v6 RIL or greater, when LTE_ON_CDMA is TRUE, always create CDMALTEPhone + * On v6 RIL, when LTE_ON_CDMA is TRUE, always create CDMALTEPhone * irrespective of the voice radio tech reported. */ if (mActivePhone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) { |