projects / GitHub / LineageOS / android_hardware_samsung.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f68609b)
libril: Readd support for MODEM_TYPE_XMM7260
authorAndreas Schneider <asn@cryptomilk.org>
Tue, 7 Apr 2015 17:01:54 +0000 (19:01 +0200)
committerAndreas Schneider <asn@cryptomilk.org>
Wed, 8 Apr 2015 12:00:38 +0000 (14:00 +0200)
Change-Id: I395e9cbfd1a42334e5e6bbb706eef9be157ecd24
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
ril/libril/Android.mk patch | blob | blame | history
ril/libril/ril.cpp patch | blob | blame | history

diff --git a/ril/libril/Android.mk b/ril/libril/Android.mk
index 101c987b8700fa188ba2bd04b291f6abf19d7f79..49f718c849a2d0278b82bd8acdcb91957132ddae 100644 (file)
--- a/ril/libril/Android.mk
+++ b/ril/libril/Android.mk
@@ -23,6 +23,9 @@ endif
 ifeq ($(BOARD_MODEM_TYPE),xmm6260)
 LOCAL_CFLAGS := -DMODEM_TYPE_XMM6260
 endif
+ifeq ($(BOARD_MODEM_TYPE),xmm7260)
+LOCAL_CFLAGS := -DMODEM_TYPE_XMM7260
+endif
 
 LOCAL_MODULE:= libril
 
diff --git a/ril/libril/ril.cpp b/ril/libril/ril.cpp
index 9a61432c79734a7f7e2b4695b16f077af7091170..43fed590147e746048bb8e6c6ffc35bd37ebbbf0 100644 (file)
--- a/ril/libril/ril.cpp
+++ b/ril/libril/ril.cpp
@@ -805,7 +805,7 @@ dispatchDial (Parcel &p, RequestInfo *pRI) {
         }
 
         if (uusPresent == 0) {
-#ifdef MODEM_TYPE_XMM6262
+#if defined(MODEM_TYPE_XMM6262) || defined(MODEM_TYPE_XMM7260)
             dial.uusInfo = NULL;
 #elif defined(MODEM_TYPE_XMM6260)
             /* Samsung hack */