Piteball/android_hardware_samsung
1
0
Fork 0
mirror of https://github.com/team-infusion-developers/android_hardware_samsung.git synced 2024-11-06 21:55:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

libril: Use consistent names for modem defines

Browse source 
Change-Id: I3ac65d2458878a6a631439be4f830c851aa50759
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Andreas Schneider 2015-04-07 18:58:14 +02:00
parent 8e5fa432f3
commit 8cb8de66bb
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ril/libril/Android.mk
View file

@ -18,10 +18,10 @@ LOCAL_SHARED_LIBRARIES := \
librilutils
ifneq ($(filter xmm6262 xmm6360,$(BOARD_MODEM_TYPE)),)
LOCAL_CFLAGS := -DMODEM_TYPE_6262
LOCAL_CFLAGS := -DMODEM_TYPE_XMM6262
endif
ifeq ($(BOARD_MODEM_TYPE),xmm6260)
LOCAL_CFLAGS := -DMODEM_TYPE_6260
LOCAL_CFLAGS := -DMODEM_TYPE_XMM6260
endif
LOCAL_MODULE:= libril
@ -43,10 +43,10 @@ LOCAL_STATIC_LIBRARIES := \
librilutils_static
ifneq ($(filter xmm6262 xmm6360,$(BOARD_MODEM_TYPE)),)
LOCAL_CFLAGS := -DMODEM_TYPE_6262
LOCAL_CFLAGS := -DMODEM_TYPE_XMM6262
endif
ifeq ($(BOARD_MODEM_TYPE),xmm6260)
LOCAL_CFLAGS := -DMODEM_TYPE_6260
LOCAL_CFLAGS := -DMODEM_TYPE_XMM6260
endif
LOCAL_MODULE:= libril_static

4
ril/libril/ril.cpp
View file

@ -805,9 +805,9 @@ dispatchDial (Parcel &p, RequestInfo *pRI) {
}
if (uusPresent == 0) {
#ifdef MODEM_TYPE_6262
#ifdef MODEM_TYPE_XMM6262
dial.uusInfo = NULL;
#elif MODEM_TYPE_6260
#elif MODEM_TYPE_XMM6260
/* Samsung hack */
memset(&uusInfo, 0, sizeof(RIL_UUS_Info));
uusInfo.uusType = (RIL_UUS_Type) 0;