openharmony/telephony_ril_adapter
1
0
Fork 0
mirror of https://gitee.com/openharmony/telephony_ril_adapter synced 2024-11-23 15:50:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

delete #ifdef

Browse Source 
Signed-off-by: clevercong <lichunlin2@huawei.com>
This commit is contained in:
clevercong 2024-01-24 18:09:26 +08:00
parent a6857b7d93
commit 59a5d2a5c4
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
services/hril/BUILD.gn
View File

@ -12,7 +12,6 @@
# limitations under the License.
import("//build/ohos.gni")
import("../../../core_service/telephony_core_service.gni")
RIL_ADAPTER = "../../"
RIL_HRIL = "../../services/hril/src"
@ -46,8 +45,6 @@ ohos_shared_library("hril") {
"LOG_DOMAIN = 0xD001F08",
]
defines += telephony_extra_defines
deps = [ "$RIL_ADAPTER/interfaces/innerkits:hril_innerkits" ]
external_deps = [

3
services/hril/src/hril_manager.cpp
View File

@ -1026,14 +1026,13 @@ int32_t GetSimSlotCount()
char simSlotCount[HRIL_SYSPARA_SIZE] = { 0 };
GetParameter(HRIL_TEL_SIM_SLOT_COUNT, HRIL_DEFAULT_SLOT_COUNT, simSlotCount, HRIL_SYSPARA_SIZE);
int32_t simSlotCountNumber = std::atoi(simSlotCount);
#ifdef OHOS_BUILD_ENABLE_TELEPHONY_VSIM
char vSimModemCount[HRIL_SYSPARA_SIZE] = { 0 };
GetParameter(HRIL_VSIM_MODEM_COUNT_STR, HRIL_DEFAULT_VSIM_MODEM_COUNT, vSimModemCount, HRIL_SYSPARA_SIZE);
int32_t vSimModemCountNumber = std::atoi(vSimModemCount);
if (simSlotCountNumber == DUAL_SLOT_COUNT && vSimModemCountNumber == MAX_SLOT_COUNT) {
simSlotCountNumber = MAX_SLOT_COUNT;
}
#endif
TELEPHONY_LOGI("GetSimSlotCount, %{public}d", simSlotCountNumber);
return simSlotCountNumber;
}