galaxys2: libril: remove handling of uusInfo and reenable
Change-Id: I7897a5d36bb5fa51e29f5244ebfbfc81f225f6cf
This commit is contained in:
parent
b6623a5227
commit
770ea9ca3d
@ -88,7 +88,7 @@ BOARD_USE_TINYALSA_AUDIO := true
|
||||
BOARD_USE_YAMAHA_MC1N2_AUDIO := true
|
||||
|
||||
# RIL
|
||||
#BOARD_PROVIDES_LIBRIL := true
|
||||
BOARD_PROVIDES_LIBRIL := true
|
||||
|
||||
# Camera
|
||||
BOARD_USES_PROPRIETARY_LIBFIMC := true
|
||||
|
@ -112,11 +112,6 @@ PRODUCT_COPY_FILES += \
|
||||
$(COMMON_PATH)/configs/media_profiles.xml:system/etc/media_profiles.xml
|
||||
|
||||
# RIL
|
||||
ifneq ($(BOARD_PROVIDES_LIBRIL),true)
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
ro.telephony.ril_class=SamsungExynos4RIL
|
||||
endif
|
||||
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
mobiledata.interfaces=pdp0,wlan0,gprs,ppp0 \
|
||||
ro.ril.hsxpa=1 \
|
||||
|
@ -596,9 +596,7 @@ invalid:
|
||||
static void
|
||||
dispatchDial (Parcel &p, RequestInfo *pRI) {
|
||||
RIL_Dial dial;
|
||||
RIL_UUS_Info uusInfo;
|
||||
int32_t t;
|
||||
int32_t uusPresent;
|
||||
status_t status;
|
||||
|
||||
memset (&dial, 0, sizeof(dial));
|
||||
@ -612,51 +610,8 @@ dispatchDial (Parcel &p, RequestInfo *pRI) {
|
||||
goto invalid;
|
||||
}
|
||||
|
||||
status = p.readInt32(&uusPresent);
|
||||
if (status != NO_ERROR) {
|
||||
goto invalid;
|
||||
}
|
||||
|
||||
if (uusPresent == 0) {
|
||||
dial.uusInfo = NULL;
|
||||
} else {
|
||||
int32_t len;
|
||||
|
||||
dial.uusInfo = NULL; // Temporary, while block below is commented out
|
||||
/*
|
||||
memset(&uusInfo, 0, sizeof(RIL_UUS_Info)); //Troublemaker
|
||||
|
||||
status = p.readInt32(&t);
|
||||
uusInfo.uusType = (RIL_UUS_Type) t;
|
||||
|
||||
status = p.readInt32(&t);
|
||||
uusInfo.uusDcs = (RIL_UUS_DCS) t;
|
||||
|
||||
status = p.readInt32(&len);
|
||||
if (status != NO_ERROR) {
|
||||
goto invalid;
|
||||
}
|
||||
|
||||
// The java code writes -1 for null arrays
|
||||
if (((int) len) == -1) {
|
||||
uusInfo.uusData = NULL;
|
||||
len = 0;
|
||||
} else {
|
||||
uusInfo.uusData = (char*) p.readInplace(len);
|
||||
}
|
||||
|
||||
uusInfo.uusLength = len;
|
||||
dial.uusInfo = &uusInfo;
|
||||
*/
|
||||
}
|
||||
|
||||
startRequest;
|
||||
appendPrintBuf("%snum=%s,clir=%d", printBuf, dial.address, dial.clir);
|
||||
if (uusPresent) {
|
||||
appendPrintBuf("%s,uusType=%d,uusDcs=%d,uusLen=%d", printBuf,
|
||||
dial.uusInfo->uusType, dial.uusInfo->uusDcs,
|
||||
dial.uusInfo->uusLength);
|
||||
}
|
||||
closeRequest;
|
||||
printRequest(pRI->token, pRI->pCI->requestNumber);
|
||||
|
||||
@ -669,7 +624,6 @@ dispatchDial (Parcel &p, RequestInfo *pRI) {
|
||||
free (dial.address);
|
||||
|
||||
#ifdef MEMSET_FREED
|
||||
memset(&uusInfo, 0, sizeof(uusInfo));
|
||||
memset(&dial, 0, sizeof(dial));
|
||||
#endif
|
||||
|
||||
@ -1453,14 +1407,6 @@ static int responseCallList(Parcel &p, void *response, size_t responselen) {
|
||||
p.writeInt32(p_cur->numberPresentation);
|
||||
writeStringToParcel(p, p_cur->name);
|
||||
p.writeInt32(p_cur->namePresentation);
|
||||
if (p_cur->uusInfo != NULL && p_cur->uusInfo->uusData != NULL) {
|
||||
RIL_UUS_Info *uusInfo = p_cur->uusInfo;
|
||||
p.writeInt32(1); /* UUS Information is present */
|
||||
p.writeInt32(uusInfo->uusType);
|
||||
p.writeInt32(uusInfo->uusDcs);
|
||||
p.writeInt32(uusInfo->uusLength);
|
||||
p.write(uusInfo->uusData, uusInfo->uusLength);
|
||||
}
|
||||
appendPrintBuf("%s[id=%d,%s,toa=%d,",
|
||||
printBuf,
|
||||
p_cur->index,
|
||||
|
Loading…
Reference in New Issue
Block a user