Piteball/android_hardware_samsung
1
0
Fork 0
mirror of https://github.com/team-infusion-developers/android_hardware_samsung.git synced 2024-11-06 21:55:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

ril: revert changes

Browse source 
Change-Id: I84c0e2784ec96b684550635899ab1d141340343c
This commit is contained in:
Shilin Victor 2019-02-21 15:22:09 +03:00
parent 727b2b1a82
commit 7cf845b07f
1 changed files with 8 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
ril/libril/ril_service.cpp
View file

@ -1331,22 +1331,6 @@ Return<void> RadioImpl::setNetworkSelectionModeManual(int32_t serial,
#endif #endif
dispatchString(serial, mSlotId, RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL, dispatchString(serial, mSlotId, RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL,
operatorNumeric.c_str()); operatorNumeric.c_str());
/**
* Qualcomm's RIL doesn't seem to issue any callbacks for opcode 47
* This may be a bug on how we call rild or simply some proprietary 'feature'
* ..and we don't care: We simply send a SUCCESS message back to the caller to
* indicate that we received the command & unblock the UI.
* The user will still see if the registration was OK by using the
* normal signal meter
*/
RLOGE("setNetworkSelectionModeManual: sending fake success event");
RequestInfo *pRI = android::addRequestToList(serial, mSlotId,
RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL);
if (pRI != NULL) {
RIL_onRequestComplete(pRI, RIL_E_SUCCESS, NULL, 0);
}
return Void(); return Void();
} }
@ -2565,8 +2549,7 @@ Return<void> RadioImpl::getRadioCapability(int32_t serial) {
#if VDBG #if VDBG
RLOGD("getRadioCapability: serial %d", serial); RLOGD("getRadioCapability: serial %d", serial);
#endif #endif
RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_GET_RADIO_CAPABILITY); dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_RADIO_CAPABILITY);
sendErrorResponse(pRI, RIL_E_REQUEST_NOT_SUPPORTED);
return Void(); return Void();
} }
@ -3966,8 +3949,7 @@ IccIoResult responseIccIo(RadioResponseInfo& responseInfo, int serial, int respo
populateResponseInfo(responseInfo, serial, responseType, e); populateResponseInfo(responseInfo, serial, responseType, e);
IccIoResult result = {}; IccIoResult result = {};
RLOGE("%s: responseLen=%d (should be %d)", __func__, responseLen, sizeof(RIL_SIM_IO_Response)); if (response == NULL || responseLen != sizeof(RIL_SIM_IO_Response)) {
if (response == NULL || responseLen < sizeof(RIL_SIM_IO_Response)) {
RLOGE("Invalid response: NULL"); RLOGE("Invalid response: NULL");
if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE; if (e == RIL_E_SUCCESS) responseInfo.error = RadioError::INVALID_RESPONSE;
result.simResponse = hidl_string(); result.simResponse = hidl_string();
@ -6653,22 +6635,22 @@ int radio::processRadioState(int newRadioState, int slotId, int indicationType,
/* This is old RIL. Decode Subscription source and Voice Radio Technology /* This is old RIL. Decode Subscription source and Voice Radio Technology
from Radio State and send change notifications if there has been a change */ from Radio State and send change notifications if there has been a change */
newVoiceRadioTech = decodeVoiceRadioTechnology((RIL_RadioState)newRadioState); newVoiceRadioTech = decodeVoiceRadioTechnology((RIL_RadioState)newRadioState);
//if(newVoiceRadioTech != voiceRadioTech) { if(newVoiceRadioTech != voiceRadioTech) {
voiceRadioTech = newVoiceRadioTech; voiceRadioTech = newVoiceRadioTech;
voiceRadioTechChangedInd(slotId, indicationType, token, e, &voiceRadioTech, sizeof(int)); voiceRadioTechChangedInd(slotId, indicationType, token, e, &voiceRadioTech, sizeof(int));
//} }
if(is3gpp2(newVoiceRadioTech)) { if(is3gpp2(newVoiceRadioTech)) {
newCdmaSubscriptionSource = decodeCdmaSubscriptionSource((RIL_RadioState)newRadioState); newCdmaSubscriptionSource = decodeCdmaSubscriptionSource((RIL_RadioState)newRadioState);
//if(newCdmaSubscriptionSource != cdmaSubscriptionSource) { if(newCdmaSubscriptionSource != cdmaSubscriptionSource) {
cdmaSubscriptionSource = newCdmaSubscriptionSource; cdmaSubscriptionSource = newCdmaSubscriptionSource;
cdmaSubscriptionSourceChangedInd(slotId, indicationType, token, e, &cdmaSubscriptionSource, sizeof(int)); cdmaSubscriptionSourceChangedInd(slotId, indicationType, token, e, &cdmaSubscriptionSource, sizeof(int));
//} }
} }
newSimStatus = decodeSimStatus((RIL_RadioState)newRadioState); newSimStatus = decodeSimStatus((RIL_RadioState)newRadioState);
//if(newSimStatus != simRuimStatus) { if(newSimStatus != simRuimStatus) {
simRuimStatus = newSimStatus; simRuimStatus = newSimStatus;
simStatusChangedInd(slotId, indicationType, token, e, &simRuimStatus, sizeof(int)); simStatusChangedInd(slotId, indicationType, token, e, &simRuimStatus, sizeof(int));
//} }
/* Send RADIO_ON to telephony */ /* Send RADIO_ON to telephony */
newRadioState = RADIO_STATE_ON; newRadioState = RADIO_STATE_ON;