oplus-giulia-dev/android_hardware_oplus
1
0
Fork 0
mirror of https://github.com/oplus-giulia-dev/android_hardware_oplus synced 2025-11-04 13:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

oplus: Get rid of in_ prefix

Browse Source 
Change-Id: Ibdafd315098ccc54ec19f298bdb28cb894017489
This commit is contained in:
LuK1337
2025-09-04 12:19:14 +02:00
committed by Bruno Martins
parent b122025d2d
commit 3633fe6cbe
7 changed files with 391 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
nrmodeswitcher/OplusRadioResponse.cpp
View File

@@ -7,199 +7,197 @@
namespace aidl::vendor::oplus::hardware::radio {
OplusRadioResponse::OplusRadioResponse(int32_t& in_result) : in_result_(in_result) {}
OplusRadioResponse::OplusRadioResponse(int32_t& result) : result_(result) {}
ndk::ScopedAStatus OplusRadioResponse::setCallbackExtResponse() {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::setNrModeResponse(const OplusRadioResponseInfo& in_info,
int32_t in_result) {
in_result_ = in_result;
ndk::ScopedAStatus OplusRadioResponse::setNrModeResponse(const OplusRadioResponseInfo& info,
int32_t result) {
result_ = result;
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::getNrModeResponse(const OplusRadioResponseInfo& in_info,
int32_t in_result) {
ndk::ScopedAStatus OplusRadioResponse::getNrModeResponse(const OplusRadioResponseInfo& info,
int32_t result) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::setModemErrorFatalResponse(
const OplusRadioResponseInfo& in_info) {
const OplusRadioResponseInfo& info) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::setVoNrEnabledResponse(
const OplusRadioResponseInfo& in_info) {
ndk::ScopedAStatus OplusRadioResponse::setVoNrEnabledResponse(const OplusRadioResponseInfo& info) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::getVoNrEnabledResponse(const OplusRadioResponseInfo& in_info,
bool in_result) {
ndk::ScopedAStatus OplusRadioResponse::getVoNrEnabledResponse(const OplusRadioResponseInfo& info,
bool result) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::setEccListResponse(const OplusRadioResponseInfo& in_info,
const std::string& in_result) {
ndk::ScopedAStatus OplusRadioResponse::setEccListResponse(const OplusRadioResponseInfo& info,
const std::string& result) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::SetHsrModeForListeningResponse(
const OplusRadioResponseInfo& in_info, int32_t in_result) {
const OplusRadioResponseInfo& info, int32_t result) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::SetLogIdForListeningResponse(
const OplusRadioResponseInfo& in_info, int32_t in_result) {
const OplusRadioResponseInfo& info, int32_t result) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::setSlowStartResponse(const OplusRadioResponseInfo& in_info) {
ndk::ScopedAStatus OplusRadioResponse::setSlowStartResponse(const OplusRadioResponseInfo& info) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::setCtVolteModeResponse(
const OplusRadioResponseInfo& in_info) {
ndk::ScopedAStatus OplusRadioResponse::setCtVolteModeResponse(const OplusRadioResponseInfo& info) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::simlockReqResponse(const OplusRadioResponseInfo& in_info,
const std::vector<uint8_t>& in_result) {
ndk::ScopedAStatus OplusRadioResponse::simlockReqResponse(const OplusRadioResponseInfo& info,
const std::vector<uint8_t>& result) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::updateRegionlockBlobResponse(
const OplusRadioResponseInfo& in_info, const std::vector<uint8_t>& in_status) {
const OplusRadioResponseInfo& info, const std::vector<uint8_t>& status) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::updateRegionlockStatusResponse(
const OplusRadioResponseInfo& in_info, const std::vector<uint8_t>& in_status) {
const OplusRadioResponseInfo& info, const std::vector<uint8_t>& status) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::getRegionlockStatusResponse(
const OplusRadioResponseInfo& in_info, const std::vector<uint8_t>& in_status) {
const OplusRadioResponseInfo& info, const std::vector<uint8_t>& status) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::setNwCongestionCfgResponse(
const OplusRadioResponseInfo& in_info, const std::vector<uint8_t>& in_status) {
const OplusRadioResponseInfo& info, const std::vector<uint8_t>& status) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::setModemEsimStatusResponse(
const OplusRadioResponseInfo& in_info) {
const OplusRadioResponseInfo& info) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::getSimlockOperatorIdResponse(
const OplusRadioResponseInfo& in_info, int32_t in_result) {
const OplusRadioResponseInfo& info, int32_t result) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::getSimlockFeestateResponse(
const OplusRadioResponseInfo& in_info, int32_t in_result) {
const OplusRadioResponseInfo& info, int32_t result) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::setSimlockFeestateResponse(
const OplusRadioResponseInfo& in_info) {
const OplusRadioResponseInfo& info) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::getSimlockUnlockStateResponse(
const OplusRadioResponseInfo& in_info, int32_t in_result) {
const OplusRadioResponseInfo& info, int32_t result) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::setSimlockFactoryResetTimeResponse(
const OplusRadioResponseInfo& in_info) {
const OplusRadioResponseInfo& info) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::getSimlockFactoryResetTimeResponse(
const OplusRadioResponseInfo& in_info, const std::vector<uint8_t>& in_status) {
const OplusRadioResponseInfo& info, const std::vector<uint8_t>& status) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::setSimlockActivateTimeResponse(
const OplusRadioResponseInfo& in_info) {
const OplusRadioResponseInfo& info) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::getSimlockActivateTimeResponse(
const OplusRadioResponseInfo& in_info, const std::vector<uint8_t>& in_status) {
const OplusRadioResponseInfo& info, const std::vector<uint8_t>& status) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::getSimlockFeatureResponse(
const OplusRadioResponseInfo& in_info, const std::vector<uint8_t>& in_feature) {
const OplusRadioResponseInfo& info, const std::vector<uint8_t>& feature) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::getSimlockLockMarkResponse(
const OplusRadioResponseInfo& in_info, const std::vector<uint8_t>& in_lockmark) {
const OplusRadioResponseInfo& info, const std::vector<uint8_t>& lockmark) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::getSimlockDeviceLockStateResponse(
const OplusRadioResponseInfo& in_info, int32_t in_lockstate) {
const OplusRadioResponseInfo& info, int32_t lockstate) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::getSimlockDeviceLockinfoResponse(
const OplusRadioResponseInfo& in_info, const std::vector<uint8_t>& in_lockinfo) {
const OplusRadioResponseInfo& info, const std::vector<uint8_t>& lockinfo) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::getSimlockVersionInfoResponse(
const OplusRadioResponseInfo& in_info, const std::vector<uint8_t>& in_version) {
const OplusRadioResponseInfo& info, const std::vector<uint8_t>& version) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::getSimlockMaxRetryResponse(
const OplusRadioResponseInfo& in_info, int32_t in_result) {
const OplusRadioResponseInfo& info, int32_t result) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::getSimlockCurrentRetryResponse(
const OplusRadioResponseInfo& in_info, int32_t in_result) {
const OplusRadioResponseInfo& info, int32_t result) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::setPsDetachAttachActionResponse(
const OplusRadioResponseInfo& in_info) {
const OplusRadioResponseInfo& info) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::unlockRegionlockResponse(
const OplusRadioResponseInfo& in_info, int32_t in_result) {
ndk::ScopedAStatus OplusRadioResponse::unlockRegionlockResponse(const OplusRadioResponseInfo& info,
int32_t result) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::updateRegionlockKeyResponse(
const OplusRadioResponseInfo& in_info, int32_t in_result) {
const OplusRadioResponseInfo& info, int32_t result) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::getRegionlockSettingDataResponse(
const OplusRadioResponseInfo& in_info, const std::vector<uint8_t>& in_result) {
const OplusRadioResponseInfo& info, const std::vector<uint8_t>& result) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::setRegionlockSettingDataResponse(
const OplusRadioResponseInfo& in_info, int32_t in_result) {
const OplusRadioResponseInfo& info, int32_t result) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::setSimlockOfflineLockResponse(
const OplusRadioResponseInfo& in_info) {
const OplusRadioResponseInfo& info) {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus OplusRadioResponse::getSimlockOfflineLockResponse(
const OplusRadioResponseInfo& in_info, const std::vector<int32_t>& in_retryCount) {
const OplusRadioResponseInfo& info, const std::vector<int32_t>& retryCount) {
return ndk::ScopedAStatus::ok();
}

133
nrmodeswitcher/OplusRadioResponse.h
View File

@@ -11,83 +11,78 @@ namespace aidl::vendor::oplus::hardware::radio {
class OplusRadioResponse : public BnOplusRadioResponse {
public:
explicit OplusRadioResponse(int32_t& in_result);
explicit OplusRadioResponse(int32_t& result);
ndk::ScopedAStatus setCallbackExtResponse() override;
ndk::ScopedAStatus setNrModeResponse(const OplusRadioResponseInfo& in_info,
int32_t in_result) override;
ndk::ScopedAStatus getNrModeResponse(const OplusRadioResponseInfo& in_info,
int32_t in_result) override;
ndk::ScopedAStatus setModemErrorFatalResponse(const OplusRadioResponseInfo& in_info) override;
ndk::ScopedAStatus setVoNrEnabledResponse(const OplusRadioResponseInfo& in_info) override;
ndk::ScopedAStatus getVoNrEnabledResponse(const OplusRadioResponseInfo& in_info,
bool in_result) override;
ndk::ScopedAStatus setEccListResponse(const OplusRadioResponseInfo& in_info,
const std::string& in_result) override;
ndk::ScopedAStatus SetHsrModeForListeningResponse(const OplusRadioResponseInfo& in_info,
int32_t in_result) override;
ndk::ScopedAStatus SetLogIdForListeningResponse(const OplusRadioResponseInfo& in_info,
int32_t in_result) override;
ndk::ScopedAStatus setSlowStartResponse(const OplusRadioResponseInfo& in_info) override;
ndk::ScopedAStatus setCtVolteModeResponse(const OplusRadioResponseInfo& in_info) override;
ndk::ScopedAStatus simlockReqResponse(const OplusRadioResponseInfo& in_info,
const std::vector<uint8_t>& in_result) override;
ndk::ScopedAStatus updateRegionlockBlobResponse(const OplusRadioResponseInfo& in_info,
const std::vector<uint8_t>& in_status) override;
ndk::ScopedAStatus updateRegionlockStatusResponse(
const OplusRadioResponseInfo& in_info, const std::vector<uint8_t>& in_status) override;
ndk::ScopedAStatus getRegionlockStatusResponse(const OplusRadioResponseInfo& in_info,
const std::vector<uint8_t>& in_status) override;
ndk::ScopedAStatus setNwCongestionCfgResponse(const OplusRadioResponseInfo& in_info,
const std::vector<uint8_t>& in_status) override;
ndk::ScopedAStatus setModemEsimStatusResponse(const OplusRadioResponseInfo& in_info) override;
ndk::ScopedAStatus getSimlockOperatorIdResponse(const OplusRadioResponseInfo& in_info,
int32_t in_result) override;
ndk::ScopedAStatus getSimlockFeestateResponse(const OplusRadioResponseInfo& in_info,
int32_t in_result) override;
ndk::ScopedAStatus setSimlockFeestateResponse(const OplusRadioResponseInfo& in_info) override;
ndk::ScopedAStatus getSimlockUnlockStateResponse(const OplusRadioResponseInfo& in_info,
int32_t in_result) override;
ndk::ScopedAStatus setNrModeResponse(const OplusRadioResponseInfo& info,
int32_t result) override;
ndk::ScopedAStatus getNrModeResponse(const OplusRadioResponseInfo& info,
int32_t result) override;
ndk::ScopedAStatus setModemErrorFatalResponse(const OplusRadioResponseInfo& info) override;
ndk::ScopedAStatus setVoNrEnabledResponse(const OplusRadioResponseInfo& info) override;
ndk::ScopedAStatus getVoNrEnabledResponse(const OplusRadioResponseInfo& info,
bool result) override;
ndk::ScopedAStatus setEccListResponse(const OplusRadioResponseInfo& info,
const std::string& result) override;
ndk::ScopedAStatus SetHsrModeForListeningResponse(const OplusRadioResponseInfo& info,
int32_t result) override;
ndk::ScopedAStatus SetLogIdForListeningResponse(const OplusRadioResponseInfo& info,
int32_t result) override;
ndk::ScopedAStatus setSlowStartResponse(const OplusRadioResponseInfo& info) override;
ndk::ScopedAStatus setCtVolteModeResponse(const OplusRadioResponseInfo& info) override;
ndk::ScopedAStatus simlockReqResponse(const OplusRadioResponseInfo& info,
const std::vector<uint8_t>& result) override;
ndk::ScopedAStatus updateRegionlockBlobResponse(const OplusRadioResponseInfo& info,
const std::vector<uint8_t>& status) override;
ndk::ScopedAStatus updateRegionlockStatusResponse(const OplusRadioResponseInfo& info,
const std::vector<uint8_t>& status) override;
ndk::ScopedAStatus getRegionlockStatusResponse(const OplusRadioResponseInfo& info,
const std::vector<uint8_t>& status) override;
ndk::ScopedAStatus setNwCongestionCfgResponse(const OplusRadioResponseInfo& info,
const std::vector<uint8_t>& status) override;
ndk::ScopedAStatus setModemEsimStatusResponse(const OplusRadioResponseInfo& info) override;
ndk::ScopedAStatus getSimlockOperatorIdResponse(const OplusRadioResponseInfo& info,
int32_t result) override;
ndk::ScopedAStatus getSimlockFeestateResponse(const OplusRadioResponseInfo& info,
int32_t result) override;
ndk::ScopedAStatus setSimlockFeestateResponse(const OplusRadioResponseInfo& info) override;
ndk::ScopedAStatus getSimlockUnlockStateResponse(const OplusRadioResponseInfo& info,
int32_t result) override;
ndk::ScopedAStatus setSimlockFactoryResetTimeResponse(
const OplusRadioResponseInfo& in_info) override;
const OplusRadioResponseInfo& info) override;
ndk::ScopedAStatus getSimlockFactoryResetTimeResponse(
const OplusRadioResponseInfo& in_info, const std::vector<uint8_t>& in_status) override;
ndk::ScopedAStatus setSimlockActivateTimeResponse(
const OplusRadioResponseInfo& in_info) override;
ndk::ScopedAStatus getSimlockActivateTimeResponse(
const OplusRadioResponseInfo& in_info, const std::vector<uint8_t>& in_status) override;
ndk::ScopedAStatus getSimlockFeatureResponse(const OplusRadioResponseInfo& in_info,
const std::vector<uint8_t>& in_feature) override;
ndk::ScopedAStatus getSimlockLockMarkResponse(const OplusRadioResponseInfo& in_info,
const std::vector<uint8_t>& in_lockmark) override;
ndk::ScopedAStatus getSimlockDeviceLockStateResponse(const OplusRadioResponseInfo& in_info,
int32_t in_lockstate) override;
const OplusRadioResponseInfo& info, const std::vector<uint8_t>& status) override;
ndk::ScopedAStatus setSimlockActivateTimeResponse(const OplusRadioResponseInfo& info) override;
ndk::ScopedAStatus getSimlockActivateTimeResponse(const OplusRadioResponseInfo& info,
const std::vector<uint8_t>& status) override;
ndk::ScopedAStatus getSimlockFeatureResponse(const OplusRadioResponseInfo& info,
const std::vector<uint8_t>& feature) override;
ndk::ScopedAStatus getSimlockLockMarkResponse(const OplusRadioResponseInfo& info,
const std::vector<uint8_t>& lockmark) override;
ndk::ScopedAStatus getSimlockDeviceLockStateResponse(const OplusRadioResponseInfo& info,
int32_t lockstate) override;
ndk::ScopedAStatus getSimlockDeviceLockinfoResponse(
const OplusRadioResponseInfo& in_info,
const std::vector<uint8_t>& in_lockinfo) override;
ndk::ScopedAStatus getSimlockVersionInfoResponse(
const OplusRadioResponseInfo& in_info, const std::vector<uint8_t>& in_version) override;
ndk::ScopedAStatus getSimlockMaxRetryResponse(const OplusRadioResponseInfo& in_info,
int32_t in_result) override;
ndk::ScopedAStatus getSimlockCurrentRetryResponse(const OplusRadioResponseInfo& in_info,
int32_t in_result) override;
ndk::ScopedAStatus setPsDetachAttachActionResponse(
const OplusRadioResponseInfo& in_info) override;
ndk::ScopedAStatus unlockRegionlockResponse(const OplusRadioResponseInfo& in_info,
int32_t in_result) override;
ndk::ScopedAStatus updateRegionlockKeyResponse(const OplusRadioResponseInfo& in_info,
int32_t in_result) override;
const OplusRadioResponseInfo& info, const std::vector<uint8_t>& lockinfo) override;
ndk::ScopedAStatus getSimlockVersionInfoResponse(const OplusRadioResponseInfo& info,
const std::vector<uint8_t>& version) override;
ndk::ScopedAStatus getSimlockMaxRetryResponse(const OplusRadioResponseInfo& info,
int32_t result) override;
ndk::ScopedAStatus getSimlockCurrentRetryResponse(const OplusRadioResponseInfo& info,
int32_t result) override;
ndk::ScopedAStatus setPsDetachAttachActionResponse(const OplusRadioResponseInfo& info) override;
ndk::ScopedAStatus unlockRegionlockResponse(const OplusRadioResponseInfo& info,
int32_t result) override;
ndk::ScopedAStatus updateRegionlockKeyResponse(const OplusRadioResponseInfo& info,
int32_t result) override;
ndk::ScopedAStatus getRegionlockSettingDataResponse(
const OplusRadioResponseInfo& in_info, const std::vector<uint8_t>& in_result) override;
ndk::ScopedAStatus setRegionlockSettingDataResponse(const OplusRadioResponseInfo& in_info,
int32_t in_result) override;
ndk::ScopedAStatus setSimlockOfflineLockResponse(
const OplusRadioResponseInfo& in_info) override;
const OplusRadioResponseInfo& info, const std::vector<uint8_t>& result) override;
ndk::ScopedAStatus setRegionlockSettingDataResponse(const OplusRadioResponseInfo& info,
int32_t result) override;
ndk::ScopedAStatus setSimlockOfflineLockResponse(const OplusRadioResponseInfo& info) override;
ndk::ScopedAStatus getSimlockOfflineLockResponse(
const OplusRadioResponseInfo& in_info,
const std::vector<int32_t>& in_retryCount) override;
const OplusRadioResponseInfo& info, const std::vector<int32_t>& retryCount) override;
private:
int32_t& in_result_;
int32_t& result_;
};
}; // namespace aidl::vendor::oplus::hardware::radio

6
nrmodeswitcher/main.cpp
View File

@@ -66,14 +66,14 @@ int main() {
continue;
}
int32_t in_result = 0;
auto resp_cb = ndk::SharedRefBase::make<OplusRadioResponse>(in_result);
int32_t result = 0;
auto resp_cb = ndk::SharedRefBase::make<OplusRadioResponse>(result);
radio->setCallback(resp_cb, nullptr);
bool succeed = false;
for (auto retry = 100; retry > 0; --retry) {
auto status = radio->setNrMode(kOplusRilSerial, mode);
if (!status.isOk() || in_result != 0) {
if (!status.isOk() || result != 0) {
LOG(ERROR) << "setNrMode failed for SIM" << i
<< ", (remaining retries: " << retry - 1 << ")";
std::this_thread::sleep_for(1s);