summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2015-04-07 19:01:54 +0200
committerEthan Chen <intervigil@gmail.com>2015-04-08 05:40:30 +0000
commit558ff593ea8c4ec85d8888a22347d09eae270cce (patch)
treee6d9270d9704f617755ceaff96b524a86e8f22bf
parent24c681013b2f54d39ecf21c5307de7140df6cbc1 (diff)
downloadandroid_hardware_samsung-558ff593ea8c4ec85d8888a22347d09eae270cce.tar.gz
android_hardware_samsung-558ff593ea8c4ec85d8888a22347d09eae270cce.tar.bz2
android_hardware_samsung-558ff593ea8c4ec85d8888a22347d09eae270cce.zip
libril: Readd support for MODEM_TYPE_XMM7260
Change-Id: I395e9cbfd1a42334e5e6bbb706eef9be157ecd24 Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
-rw-r--r--ril/libril/Android.mk3
-rw-r--r--ril/libril/ril.cpp2
2 files changed, 4 insertions, 1 deletions
diff --git a/ril/libril/Android.mk b/ril/libril/Android.mk
index 101c987..49f718c 100644
--- 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 9a61432..43fed59 100644
--- 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 */