Piteball/android_device_samsung_matisse-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

klte-common: Only allow LP RIL

Browse source 
* KK RIL libraries appears to be incompatible with M.

Change-Id: I79c124c1b6b58827cfcf4cfde0822f3b8b9081a1
This commit is contained in:
Ethan Chen 2015-11-14 00:02:18 -08:00
parent 596d0d52b9
commit 1ce730771d
1 changed files with 13 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
ril/telephony/java/com/android/internal/telephony/KlteRIL.java
View file

@ -41,13 +41,10 @@ import java.util.Collections;
*/
public class KlteRIL extends RIL {
private static final int RIL_REQUEST_DIAL_EMERGENCY = 10016;
private static final int RIL_REQUEST_DIAL_EMERGENCY_LL = 10001;
private static final int RIL_REQUEST_DIAL_EMERGENCY = 10001;
private static final int RIL_UNSOL_ON_SS_LL = 11055;
private static final String RIL_VERSION_PROPERTY = "ro.sec_ril.version";
private boolean mIsGsm = false;
private boolean isLollipopRadio = SystemProperties.getInt(RIL_VERSION_PROPERTY, 44) == 50;
public KlteRIL(Context context, int networkMode, int cdmaSubscription) {
super(context, networkMode, cdmaSubscription, null);
@ -194,8 +191,6 @@ public class KlteRIL extends RIL {
dc.isVoice = (0 != voiceSettings);
if (mIsGsm) {
boolean isVideo;
if (!isLollipopRadio)
isVideo = (0 != p.readInt()); // Samsung CallDetails
int call_type = p.readInt(); // Samsung CallDetails
int call_domain = p.readInt(); // Samsung CallDetails
String csv = p.readString(); // Samsung CallDetails
@ -205,11 +200,7 @@ public class KlteRIL extends RIL {
int np = p.readInt();
dc.numberPresentation = DriverCall.presentationFromCLIP(np);
dc.name = p.readString();
if (!isLollipopRadio) {
dc.namePresentation = p.readInt();
} else {
dc.namePresentation = DriverCall.presentationFromCLIP(p.readInt());
}
dc.namePresentation = DriverCall.presentationFromCLIP(p.readInt());
int uusInfoPresent = p.readInt();
if (uusInfoPresent == 1) {
dc.uusInfo = new UUSInfo();
@ -329,16 +320,14 @@ public class KlteRIL extends RIL {
int response = p.readInt();
int newResponse = response;
if (isLollipopRadio) {
switch(response) {
case RIL_UNSOL_ON_SS_LL:
newResponse = RIL_UNSOL_ON_SS;
break;
}
if (newResponse != response) {
p.setDataPosition(dataPosition);
p.writeInt(newResponse);
}
switch(response) {
case RIL_UNSOL_ON_SS_LL:
newResponse = RIL_UNSOL_ON_SS;
break;
}
if (newResponse != response) {
p.setDataPosition(dataPosition);
p.writeInt(newResponse);
}
p.setDataPosition(dataPosition);
super.processUnsolicited(p);
@ -350,10 +339,8 @@ public class KlteRIL extends RIL {
RILRequest rr
= RILRequest.obtain(RIL_REQUEST_ANSWER, result);
if (isLollipopRadio) {
rr.mParcel.writeInt(1);
rr.mParcel.writeInt(0);
}
rr.mParcel.writeInt(1);
rr.mParcel.writeInt(0);
if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
@ -365,11 +352,7 @@ public class KlteRIL extends RIL {
dialEmergencyCall(String address, int clirMode, Message result) {
RILRequest rr;
if (isLollipopRadio) {
rr = RILRequest.obtain(RIL_REQUEST_DIAL_EMERGENCY_LL, result);
} else {
rr = RILRequest.obtain(RIL_REQUEST_DIAL_EMERGENCY, result);
}
rr = RILRequest.obtain(RIL_REQUEST_DIAL_EMERGENCY, result);
rr.mParcel.writeString(address);
rr.mParcel.writeInt(clirMode);
rr.mParcel.writeInt(0); // CallDetails.call_type