lineage/android_device_samsung_msm8974-common
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

msm8974-common: libril: Add DISABLE_RILD_OEM_HOOK.

Browse Source 
OEM hook is deprecated, so adding a way to disable it to
this radio implementation.

Bug: 75322118
Test: boot device w/ DISABLE_RILD_OEM_HOOK works, lshal
Change-Id: Ie7ade48476d2c330df608e9cc8dab805f84dd81d
This commit is contained in:
Steven Moreland 2018-03-20 11:20:05 -07:00 committed by Kevin F. Haggerty
parent 6762d13586
commit 7e86bb0923
No known key found for this signature in database
GPG Key ID: 6D95512933112729
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ril/libril/Android.mk
View File

@ -38,6 +38,10 @@ ifeq ($(SIM_COUNT), 2)
LOCAL_CFLAGS += -DANDROID_SIM_COUNT_2
endif
ifneq ($(DISABLE_RILD_OEM_HOOK),)
LOCAL_CFLAGS += -DOEM_HOOK_DISABLED
endif
LOCAL_C_INCLUDES += external/nanopb-c
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include

21
ril/libril/ril_service.cpp
View File

@ -67,6 +67,12 @@ using android::sp;
#define CALL_ONSTATEREQUEST(a) s_vendorFunctions->onStateRequest()
#endif
#ifdef OEM_HOOK_DISABLED
constexpr bool kOemHookEnabled = false;
#else
constexpr bool kOemHookEnabled = true;
#endif
RIL_RadioFunctions *s_vendorFunctions = NULL;
static CommandInfo *s_commands;
@ -6737,6 +6743,8 @@ int radio::sendRequestRawResponse(int slotId,
RLOGD("sendRequestRawResponse: serial %d", serial);
#endif
if (!kOemHookEnabled) return 0;
if (oemHookService[slotId]->mOemHookResponse != NULL) {
RadioResponseInfo responseInfo = {};
populateResponseInfo(responseInfo, serial, responseType, e);
@ -6766,6 +6774,8 @@ int radio::sendRequestStringsResponse(int slotId,
RLOGD("sendRequestStringsResponse: serial %d", serial);
#endif
if (!kOemHookEnabled) return 0;
if (oemHookService[slotId]->mOemHookResponse != NULL) {
RadioResponseInfo responseInfo = {};
populateResponseInfo(responseInfo, serial, responseType, e);
@ -8607,6 +8617,8 @@ int radio::keepaliveStatusInd(int slotId,
int radio::oemHookRawInd(int slotId,
int indicationType, int token, RIL_Errno e, void *response,
size_t responseLen) {
if (!kOemHookEnabled) return 0;
if (oemHookService[slotId] != NULL && oemHookService[slotId]->mOemHookIndication != NULL) {
if (response == NULL || responseLen == 0) {
RLOGE("oemHookRawInd: invalid response");
@ -8656,12 +8668,15 @@ void radio::registerService(RIL_RadioFunctions *callbacks, CommandInfo *commands
radioService[i] = new RadioImpl;
radioService[i]->mSlotId = i;
oemHookService[i] = new OemHookImpl;
oemHookService[i]->mSlotId = i;
RLOGD("registerService: starting android::hardware::radio::V1_1::IRadio %s",
serviceNames[i]);
android::status_t status = radioService[i]->registerAsService(serviceNames[i]);
status = oemHookService[i]->registerAsService(serviceNames[i]);
if (kOemHookEnabled) {
oemHookService[i] = new OemHookImpl;
oemHookService[i]->mSlotId = i;
status = oemHookService[i]->registerAsService(serviceNames[i]);
}
ret = pthread_rwlock_unlock(radioServiceRwlockPtr);
assert(ret == 0);