diff options
| author | Shareef Ali <shareefalis@cyanogenmod.org> | 2013-07-08 20:27:58 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-07-08 20:27:58 -0700 |
| commit | 3be9b07951326a2df37e162d6c2de0cc98db7dce (patch) | |
| tree | 8383a77689c2244c5a9b07d2473ced611a42915a /src/java/com/android/internal | |
| parent | 8595cc47a58818d41ad508c02c561e94163191fe (diff) | |
| parent | 5e0983ba3e96083da094d9706beadacce6b4e9c9 (diff) | |
| download | frameworks_opt_telephony-3be9b07951326a2df37e162d6c2de0cc98db7dce.zip frameworks_opt_telephony-3be9b07951326a2df37e162d6c2de0cc98db7dce.tar.gz frameworks_opt_telephony-3be9b07951326a2df37e162d6c2de0cc98db7dce.tar.bz2 | |
Merge "PhoneProxy: when using v6 or greater ril make sure current phone type isnt GSM" into cm-10.1
Diffstat (limited to 'src/java/com/android/internal')
| -rw-r--r-- | src/java/com/android/internal/telephony/PhoneProxy.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/java/com/android/internal/telephony/PhoneProxy.java b/src/java/com/android/internal/telephony/PhoneProxy.java index 38fe68d..a1a8d88 100644 --- a/src/java/com/android/internal/telephony/PhoneProxy.java +++ b/src/java/com/android/internal/telephony/PhoneProxy.java @@ -31,6 +31,7 @@ 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; @@ -55,8 +56,6 @@ 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; @@ -148,10 +147,10 @@ public class PhoneProxy extends Handler implements Phone { private void updatePhoneObject(int newVoiceRadioTech) { if (mActivePhone != null) { - if((mRilVersion == 6 && getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE) || - mRilV7NeedsCDMALTEPhone) { + int phoneType = TelephonyManager.getPhoneType(TelephonyManager.getDefault().getNetworkType()); + if(mRilVersion >= 6 && getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE && phoneType != PhoneConstants.PHONE_TYPE_GSM) { /* - * On v6 RIL, when LTE_ON_CDMA is TRUE, always create CDMALTEPhone + * On v6 RIL or greater, when LTE_ON_CDMA is TRUE, always create CDMALTEPhone * irrespective of the voice radio tech reported. */ if (mActivePhone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) { |