Skip to content

libradiocompat: Deprecate getDeviceIdentity and use getImei instead #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
realahnet wants to merge 1 commit into
base: sixteen
Choose a base branch
from
Open

libradiocompat: Deprecate getDeviceIdentity and use getImei instead #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions radio/aidl/compat/libradiocompat/modem/RadioModem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ ScopedAStatus RadioModem::getBasebandVersion(int32_t serial) {

ScopedAStatus RadioModem::getDeviceIdentity(int32_t serial) {
LOG_CALL << serial;
mHal1_5->getDeviceIdentity(serial);
LOG(ERROR) << " getDeviceIdentity is deprecated, use getImei instead";
respond()->getDeviceIdentityResponse(notSupported(serial), nullptr, nullptr, nullptr, nullptr);
return ok();
}

ScopedAStatus RadioModem::getImei(int32_t serial) {
LOG_CALL << serial;
LOG(ERROR) << " getImei is unsupported by HIDL HALs";
respond()->getImeiResponse(notSupported(serial), {});
mHal1_5->getDeviceIdentity(serial);
return ok();
}

Expand Down
5 changes: 3 additions & 2 deletions radio/aidl/compat/libradiocompat/modem/RadioResponse-modem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,10 @@ Return<void> RadioResponse::getBasebandVersionResponse(const V1_0::RadioResponse

Return<void> RadioResponse::getDeviceIdentityResponse( //
const V1_0::RadioResponseInfo& info, const hidl_string& imei, const hidl_string& imeisv,
const hidl_string& esn, const hidl_string& meid) {
const hidl_string& /*esn*/, const hidl_string& /*meid*/) {
LOG_CALL << info.serial;
modemCb()->getDeviceIdentityResponse(toAidl(info), imei, imeisv, esn, meid);
aidl::ImeiInfo imeiInfo(aidl::ImeiInfo::ImeiType::PRIMARY, imei, imeisv);
modemCb()->getImeiResponse(toAidl(info), imeiInfo);
return {};
}

Expand Down