summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorEmilio López <turl@tuxfamily.org>2011-11-20 22:12:28 +0000
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2011-11-22 12:03:37 +0000
commitd9d9847062d0d5da354e881545a30b5c9e7077d6 (patch)
tree8498f53fa51221ddd251fefef52aec50bb06b660 /telephony
parent5cfa5ee93a48fbf20b5e8ead58857b7abf6c90c3 (diff)
downloadframeworks_base-d9d9847062d0d5da354e881545a30b5c9e7077d6.zip
frameworks_base-d9d9847062d0d5da354e881545a30b5c9e7077d6.tar.gz
frameworks_base-d9d9847062d0d5da354e881545a30b5c9e7077d6.tar.bz2
RIL: handle the lack of version gracefully on older RILs
Change-Id: I8227c55968f502112c5b6ac334eee505c29924c2
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/com/android/internal/telephony/RIL.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/telephony/java/com/android/internal/telephony/RIL.java b/telephony/java/com/android/internal/telephony/RIL.java
index 0d858ff..99b7cbb 100644
--- a/telephony/java/com/android/internal/telephony/RIL.java
+++ b/telephony/java/com/android/internal/telephony/RIL.java
@@ -3032,8 +3032,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
protected Object
responseDataCallList(Parcel p) {
ArrayList<DataCallState> response;
-
- int ver = p.readInt();
+ int oldRil = SystemProperties.getInt("ro.telephony.ril.v3", 0);
+ int ver = (oldRil!=0 ? 3 : p.readInt());
int num = p.readInt();
riljLog("responseDataCallList ver=" + ver + " num=" + num);
@@ -3047,7 +3047,8 @@ public class RIL extends BaseCommands implements CommandsInterface {
protected Object
responseSetupDataCall(Parcel p) {
- int ver = p.readInt();
+ int oldRil = SystemProperties.getInt("ro.telephony.ril.v3", 0);
+ int ver = (oldRil!=0 ? 3 : p.readInt());
int num = p.readInt();
if (RILJ_LOGV) riljLog("responseSetupDataCall ver=" + ver + " num=" + num);