From b542add5c77710ba5621b0a6006a9022bf807669 Mon Sep 17 00:00:00 2001 From: Tomasz Wasilczyk Date: Mon, 8 Aug 2022 19:04:26 +0000 Subject: [PATCH] Don't use C-style cast. I thought Type{valueOfOtherPrimitiveType} is a fancy way of doing static cast. It's not. In fact, it's the same as (Type)valueOfOtherType. Bug: 241599082 Test: make -k100 tidy-hardware-interfaces-radio Change-Id: I85ddbe54601b9111030013be85226b90f3d2fe6f --- radio/aidl/compat/libradiocompat/data/structs.cpp | 14 +++++++------- .../compat/libradiocompat/messaging/structs.cpp | 14 +++++++------- radio/aidl/compat/libradiocompat/modem/structs.cpp | 6 +++--- .../aidl/compat/libradiocompat/network/structs.cpp | 4 ++-- radio/aidl/compat/libradiocompat/sim/structs.cpp | 4 ++-- radio/aidl/compat/libradiocompat/voice/structs.cpp | 8 ++++---- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/radio/aidl/compat/libradiocompat/data/structs.cpp b/radio/aidl/compat/libradiocompat/data/structs.cpp index 4ff89a1491..cc6dcbcdf5 100644 --- a/radio/aidl/compat/libradiocompat/data/structs.cpp +++ b/radio/aidl/compat/libradiocompat/data/structs.cpp @@ -28,14 +28,14 @@ namespace aidl = ::aidl::android::hardware::radio::data; V1_5::DataProfileInfo toHidl(const aidl::DataProfileInfo& info) { return { - .profileId = V1_0::DataProfileId{info.profileId}, + .profileId = static_cast(info.profileId), .apn = info.apn, - .protocol = V1_4::PdpProtocolType{info.protocol}, - .roamingProtocol = V1_4::PdpProtocolType{info.roamingProtocol}, - .authType = V1_0::ApnAuthType{info.authType}, + .protocol = static_cast(info.protocol), + .roamingProtocol = static_cast(info.roamingProtocol), + .authType = static_cast(info.authType), .user = info.user, .password = info.password, - .type = V1_0::DataProfileInfoType{info.type}, + .type = static_cast(info.type), .maxConnsTime = info.maxConnsTime, .maxConns = info.maxConns, .waitTime = info.waitTime, @@ -74,7 +74,7 @@ V1_6::SliceInfo toHidl(const aidl::SliceInfo& info) { .sliceDifferentiator = info.sliceDifferentiator, .mappedHplmnSst = static_cast(info.mappedHplmnSst), .mappedHplmnSD = info.mappedHplmnSd, - .status = V1_6::SliceStatus{info.status}, + .status = static_cast(info.status), }; } @@ -106,7 +106,7 @@ V1_6::OsAppId toHidl(const aidl::OsAppId& appId) { V1_1::KeepaliveRequest toHidl(const aidl::KeepaliveRequest& keep) { return { - .type = V1_1::KeepaliveType{keep.type}, + .type = static_cast(keep.type), .sourceAddress = keep.sourceAddress, .sourcePort = keep.sourcePort, .destinationAddress = keep.destinationAddress, diff --git a/radio/aidl/compat/libradiocompat/messaging/structs.cpp b/radio/aidl/compat/libradiocompat/messaging/structs.cpp index 90196802e1..f30c5ce50e 100644 --- a/radio/aidl/compat/libradiocompat/messaging/structs.cpp +++ b/radio/aidl/compat/libradiocompat/messaging/structs.cpp @@ -45,11 +45,11 @@ static aidl::CdmaSmsAddress toAidl(const V1_0::CdmaSmsAddress& addr) { static V1_0::CdmaSmsAddress toHidl(const aidl::CdmaSmsAddress& addr) { return { - .digitMode = V1_0::CdmaSmsDigitMode{addr.digitMode}, + .digitMode = static_cast(addr.digitMode), .numberMode = addr.isNumberModeDataNetwork ? V1_0::CdmaSmsNumberMode::DATA_NETWORK : V1_0::CdmaSmsNumberMode::NOT_DATA_NETWORK, - .numberType = V1_0::CdmaSmsNumberType{addr.numberType}, - .numberPlan = V1_0::CdmaSmsNumberPlan{addr.numberPlan}, + .numberType = static_cast(addr.numberType), + .numberPlan = static_cast(addr.numberPlan), .digits = addr.digits, }; } @@ -64,7 +64,7 @@ static aidl::CdmaSmsSubaddress toAidl(const V1_0::CdmaSmsSubaddress& addr) { static V1_0::CdmaSmsSubaddress toHidl(const aidl::CdmaSmsSubaddress& addr) { return { - .subaddressType = V1_0::CdmaSmsSubaddressType{addr.subaddressType}, + .subaddressType = static_cast(addr.subaddressType), .odd = addr.odd, .digits = addr.digits, }; @@ -94,7 +94,7 @@ V1_0::CdmaSmsMessage toHidl(const aidl::CdmaSmsMessage& msg) { V1_0::ImsSmsMessage toHidl(const aidl::ImsSmsMessage& msg) { return { - .tech = V1_0::RadioTechnologyFamily{msg.tech}, + .tech = static_cast(msg.tech), .retry = msg.retry, .messageRef = msg.messageRef, .cdmaMessage = toHidl(msg.cdmaMessage), @@ -147,14 +147,14 @@ V1_0::GsmBroadcastSmsConfigInfo toHidl(const aidl::GsmBroadcastSmsConfigInfo& in V1_0::CdmaSmsWriteArgs toHidl(const aidl::CdmaSmsWriteArgs& args) { return { - .status = V1_0::CdmaSmsWriteArgsStatus{args.status}, + .status = static_cast(args.status), .message = toHidl(args.message), }; } V1_0::SmsWriteArgs toHidl(const aidl::SmsWriteArgs& args) { return { - .status = V1_0::SmsWriteArgsStatus{args.status}, + .status = static_cast(args.status), .pdu = args.pdu, .smsc = args.smsc, }; diff --git a/radio/aidl/compat/libradiocompat/modem/structs.cpp b/radio/aidl/compat/libradiocompat/modem/structs.cpp index 69e651be42..6f32cdf02e 100644 --- a/radio/aidl/compat/libradiocompat/modem/structs.cpp +++ b/radio/aidl/compat/libradiocompat/modem/structs.cpp @@ -30,7 +30,7 @@ namespace aidl = ::aidl::android::hardware::radio::modem; V1_0::NvWriteItem toHidl(const aidl::NvWriteItem& item) { return { - .itemId = V1_0::NvItem{item.itemId}, + .itemId = static_cast(item.itemId), .value = item.value, }; } @@ -48,10 +48,10 @@ aidl::RadioCapability toAidl(const V1_0::RadioCapability& capa) { V1_0::RadioCapability toHidl(const aidl::RadioCapability& capa) { return { .session = capa.session, - .phase = V1_0::RadioCapabilityPhase{capa.phase}, + .phase = static_cast(capa.phase), .raf = toHidlBitfield(capa.raf), .logicalModemUuid = capa.logicalModemUuid, - .status = V1_0::RadioCapabilityStatus{capa.status}, + .status = static_cast(capa.status), }; } diff --git a/radio/aidl/compat/libradiocompat/network/structs.cpp b/radio/aidl/compat/libradiocompat/network/structs.cpp index d0b3b907ce..30d4f6dd72 100644 --- a/radio/aidl/compat/libradiocompat/network/structs.cpp +++ b/radio/aidl/compat/libradiocompat/network/structs.cpp @@ -66,7 +66,7 @@ V1_5::NgranBands toHidl(aidl::NgranBands band) { V1_5::SignalThresholdInfo toHidl(const aidl::SignalThresholdInfo& info) { return { - .signalMeasurement = V1_5::SignalMeasurementType{info.signalMeasurement}, + .signalMeasurement = static_cast(info.signalMeasurement), .hysteresisMs = info.hysteresisMs, .hysteresisDb = info.hysteresisDb, .thresholds = info.thresholds, @@ -155,7 +155,7 @@ V1_5::RadioAccessSpecifier toHidl(const aidl::RadioAccessSpecifier& spec) { V1_5::NetworkScanRequest toHidl(const aidl::NetworkScanRequest& req) { return { - .type = V1_1::ScanType{req.type}, + .type = static_cast(req.type), .interval = req.interval, .specifiers = toHidl(req.specifiers), .maxSearchTime = req.maxSearchTime, diff --git a/radio/aidl/compat/libradiocompat/sim/structs.cpp b/radio/aidl/compat/libradiocompat/sim/structs.cpp index bfbff029df..00db2b8718 100644 --- a/radio/aidl/compat/libradiocompat/sim/structs.cpp +++ b/radio/aidl/compat/libradiocompat/sim/structs.cpp @@ -65,7 +65,7 @@ V1_0::Carrier toHidl(const aidl::Carrier& carrier) { return { .mcc = carrier.mcc, .mnc = carrier.mnc, - .matchType = V1_0::CarrierMatchType{carrier.matchType}, + .matchType = static_cast(carrier.matchType), .matchData = carrier.matchData, }; } @@ -107,7 +107,7 @@ V1_1::ImsiEncryptionInfo toHidl(const aidl::ImsiEncryptionInfo& info) { V1_6::ImsiEncryptionInfo toHidl_1_6(const aidl::ImsiEncryptionInfo& info) { return { .base = toHidl(info), - .keyType = V1_6::PublicKeyType{info.keyType}, + .keyType = static_cast(info.keyType), }; } diff --git a/radio/aidl/compat/libradiocompat/voice/structs.cpp b/radio/aidl/compat/libradiocompat/voice/structs.cpp index 254ea20c42..35c8d467dc 100644 --- a/radio/aidl/compat/libradiocompat/voice/structs.cpp +++ b/radio/aidl/compat/libradiocompat/voice/structs.cpp @@ -29,15 +29,15 @@ namespace aidl = ::aidl::android::hardware::radio::voice; V1_0::Dial toHidl(const aidl::Dial& info) { return { .address = info.address, - .clir = V1_0::Clir{info.clir}, + .clir = static_cast(info.clir), .uusInfo = toHidl(info.uusInfo), }; } V1_0::UusInfo toHidl(const aidl::UusInfo& info) { return { - .uusType = V1_0::UusType{info.uusType}, - .uusDcs = V1_0::UusDcs{info.uusDcs}, + .uusType = static_cast(info.uusType), + .uusDcs = static_cast(info.uusDcs), .uusData = info.uusData, }; } @@ -55,7 +55,7 @@ aidl::CallForwardInfo toAidl(const V1_0::CallForwardInfo& info) { V1_0::CallForwardInfo toHidl(const aidl::CallForwardInfo& info) { return { - .status = V1_0::CallForwardInfoStatus{info.status}, + .status = static_cast(info.status), .reason = info.reason, .serviceClass = info.serviceClass, .toa = info.toa,