telephony: DataConnection: support old RILs

Older RILs require different technology value Change-Id: I0249bb597e2592b7e951945bc97d144ee2b2307a
WoH · Aug 7, 2013 · 470c455 · 470c455 · WoH · Aug 7, 2013
1 parent 8a23092
commit 470c455
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
@@ -580,7 +580,16 @@ private void notifyDisconnectCompleted(DisconnectParams dp, boolean sendAll) {
 
     private int getRilRadioTechnology() {
         int rilRadioTechnology;
-        if (mApnSetting.bearer > 0) {
+        if (mPhone.mCi.getRilVersion() < 6) {
+            int phoneType = mPhone.getPhoneType();
+            if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {
+                return RILConstants.SETUP_DATA_TECH_GSM;
+            } else if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
+                return RILConstants.SETUP_DATA_TECH_CDMA;
+            } else {
+                throw new RuntimeException("Unknown phoneType " + phoneType + ", should not happen");
+            }
+        } else if (mApnSetting.bearer > 0) {
             rilRadioTechnology = mApnSetting.bearer + 2;
         } else {
             rilRadioTechnology = mPhone.getServiceState().getRilDataRadioTechnology() + 2;