summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Ferguson <ferguson.david@gmail.com>2013-06-02 12:23:41 -0400
committerDavid Ferguson <ferguson.david@gmail.com>2013-06-02 12:23:47 -0400
commit61406f17b3041299a4350203682ff27bc15322e5 (patch)
treeaa6635683e56b53df3298709b14a8e19f0eb2203
parentfdddaed0ea282cd90c849f3658cbce95c7f130b6 (diff)
downloadframeworks_opt_telephony-61406f17b3041299a4350203682ff27bc15322e5.zip
frameworks_opt_telephony-61406f17b3041299a4350203682ff27bc15322e5.tar.gz
frameworks_opt_telephony-61406f17b3041299a4350203682ff27bc15322e5.tar.bz2
SamsungQualcommRIL: evaluate samsungDriverCall in responseCallList()
* fixes race condition where mRilVersion is not valid when setPhoneType() is called. When this happens, the auto-enable of samsungDriverCall for v7 RIL's is broken. The result is that hanging up does not work. Change-Id: I2642110d3683648aaff722c86d3dc21cbd9ee802
-rw-r--r--src/java/com/android/internal/telephony/SamsungQualcommRIL.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/java/com/android/internal/telephony/SamsungQualcommRIL.java b/src/java/com/android/internal/telephony/SamsungQualcommRIL.java
index 125d518..52c8431 100644
--- a/src/java/com/android/internal/telephony/SamsungQualcommRIL.java
+++ b/src/java/com/android/internal/telephony/SamsungQualcommRIL.java
@@ -198,7 +198,13 @@ public class SamsungQualcommRIL extends RIL implements CommandsInterface {
public void setPhoneType(int phoneType){
super.setPhoneType(phoneType);
isGSM = (phoneType != RILConstants.CDMA_PHONE);
+ }
+
+ @Override
+ protected Object
+ responseCallList(Parcel p) {
samsungDriverCall = (needsOldRilFeature("newDriverCall") && !isGSM) || mRilVersion < 7 ? false : true;
+ return super.responseCallList(p);
}
@Override