summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2017-05-18 19:01:07 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-18 19:01:07 +0000
commitb863304d017298262f32b5737e983e4f0bc80518 (patch)
treedf9f7d37c097e537edd86042578784c9cb4bc330 /include
parent991e200ed688000cc577c0a56a991942e0bce504 (diff)
parent93f603c4e168c30fbc1366c1b6c6ac0f0a4b4b6e (diff)
downloadandroid_hardware_ril-b863304d017298262f32b5737e983e4f0bc80518.tar.gz
android_hardware_ril-b863304d017298262f32b5737e983e4f0bc80518.tar.bz2
android_hardware_ril-b863304d017298262f32b5737e983e4f0bc80518.zip
Fix multi sim support and warnings in new hal code.
am: 93f603c4e1 Change-Id: I140b9892eb75cafd84784bdfe1c1ab969f2ec799
Diffstat (limited to 'include')
-rw-r--r--include/telephony/ril.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/telephony/ril.h b/include/telephony/ril.h
index f40bbfe..12258bf 100644
--- a/include/telephony/ril.h
+++ b/include/telephony/ril.h
@@ -31,7 +31,7 @@
extern "C" {
#endif
-
+#ifndef SIM_COUNT
#if defined(ANDROID_SIM_COUNT_2)
#define SIM_COUNT 2
#elif defined(ANDROID_SIM_COUNT_3)
@@ -45,6 +45,7 @@ extern "C" {
#ifndef ANDROID_MULTI_SIM
#define SIM_COUNT 1
#endif
+#endif
/*
* RIL version.