From 21cd0f77f7caa980c30a7dbd6814ba1030ccd2bc Mon Sep 17 00:00:00 2001 From: roynatech2544 Date: Sat, 3 Dec 2022 18:36:46 +0900 Subject: [PATCH] universal7885: interfaces: radio: Replace to stub implementation --- .../interfaces/radio/2.0/Android.bp | 17 -- .../interfaces/radio/2.0/ISehRadio.hal | 54 ----- .../radio/2.0/ISehRadioIndication.hal | 32 --- .../radio/2.0/ISehRadioResponse.hal | 48 ---- .../interfaces/radio/2.0/types.hal | 225 ------------------ .../interfaces/radio/2.1/Android.bp | 6 +- .../interfaces/radio/2.1/ISehRadio.hal | 8 +- .../radio/2.1/ISehRadioIndication.hal | 4 +- .../radio/2.1/ISehRadioResponse.hal | 4 +- .../interfaces/radio/2.1/types.hal | 9 - .../interfaces/radio/channel/2.0/Android.bp | 14 -- .../radio/channel/2.0/ISehChannel.hal | 8 - .../radio/channel/2.0/ISehChannelCallback.hal | 5 - 13 files changed, 10 insertions(+), 424 deletions(-) delete mode 100644 universal7885-common/hidl-packages/interfaces/radio/2.0/Android.bp delete mode 100644 universal7885-common/hidl-packages/interfaces/radio/2.0/ISehRadio.hal delete mode 100644 universal7885-common/hidl-packages/interfaces/radio/2.0/ISehRadioIndication.hal delete mode 100644 universal7885-common/hidl-packages/interfaces/radio/2.0/ISehRadioResponse.hal delete mode 100644 universal7885-common/hidl-packages/interfaces/radio/2.0/types.hal delete mode 100644 universal7885-common/hidl-packages/interfaces/radio/2.1/types.hal delete mode 100644 universal7885-common/hidl-packages/interfaces/radio/channel/2.0/Android.bp delete mode 100644 universal7885-common/hidl-packages/interfaces/radio/channel/2.0/ISehChannel.hal delete mode 100644 universal7885-common/hidl-packages/interfaces/radio/channel/2.0/ISehChannelCallback.hal diff --git a/universal7885-common/hidl-packages/interfaces/radio/2.0/Android.bp b/universal7885-common/hidl-packages/interfaces/radio/2.0/Android.bp deleted file mode 100644 index 29bbf15..0000000 --- a/universal7885-common/hidl-packages/interfaces/radio/2.0/Android.bp +++ /dev/null @@ -1,17 +0,0 @@ -// This file is autogenerated by hidl-gen -Landroidbp. - -hidl_interface { - name: "vendor.samsung.hardware.radio@2.0", - root: "vendor.samsung.hardware", - srcs: [ - "ISehRadio.hal", - "ISehRadioIndication.hal", - "ISehRadioResponse.hal", - "types.hal" - ], - interfaces: [ - "android.hardware.radio@1.0", - "android.hidl.base@1.0", - ], - gen_java: true, -} diff --git a/universal7885-common/hidl-packages/interfaces/radio/2.0/ISehRadio.hal b/universal7885-common/hidl-packages/interfaces/radio/2.0/ISehRadio.hal deleted file mode 100644 index 8412b2b..0000000 --- a/universal7885-common/hidl-packages/interfaces/radio/2.0/ISehRadio.hal +++ /dev/null @@ -1,54 +0,0 @@ -package vendor.samsung.hardware.radio@2.0; - -import ISehRadioIndication; -import ISehRadioResponse; -import android.hardware.radio@1.0::CdmaSmsMessage; -import android.hardware.radio@1.0::GsmSmsMessage; -import android.hardware.radio@1.0::ImsSmsMessage; - -interface ISehRadio { - oneway setResponseFunctions(ISehRadioResponse radioResponse, - ISehRadioIndication radioIndication); - oneway getIccCardStatus(int32_t serial); - supplyNetworkDepersonalization(int32_t serial, string netpin, - int32_t lockstate); - dial(int32_t serial, SehDial dial); - getCurrentCalls(int32_t serial); - getImsRegistrationState(); - getAvailableNetworks(int32_t serial); - setImsCallList(int32_t serial, vec imscalls); - getPreferredNetworkList(int32_t serial); - setPreferredNetworkList(int32_t serial, SehPreferredNetworkInfo info); - sendEncodedUssd(int32_t serial, SehEncodedUssd ussd); - getDisable2g(int32_t serial); - setDisable2g(int32_t serial, int32_t mode); - getCnap(int32_t serial); - getPhonebookStorageInfo(int32_t serial, int32_t fileid); - getUsimPhonebookCapability(int32_t serial); - setSimOnOff(int32_t serial, int32_t mode); - setSimInitEvent(int32_t serial); - getSimLockInfo(int32_t serial, int32_t numLockType, int32_t lockType); - supplyIccPersonalization(int32_t serial, string pin); - changeIccPersonalization(int32_t serial, string oldpass, string newpass); - sendCdmaSmsExpectMore(int32_t serial, CdmaSmsMessage msg); - getPhonebookEntry(int32_t serial, int32_t fileid, int32_t index); - accessPhonebookEntry(int32_t serial, int32_t command, int32_t fileid, - int32_t index, SehAdnRecord record, string pin); - getCellBroadcastConfig(int32_t serial); - emergencySearch(int32_t serial); - emergencyControl(int32_t serial, int32_t control); - getAtr(int32_t serial); - sendSms(int32_t serial, GsmSmsMessage msg); - sendSMSExpectMore(int32_t serial, GsmSmsMessage msg); - sendCdmaSms(int32_t serial, CdmaSmsMessage msg); - sendImsSms(int32_t serial, ImsSmsMessage msg); - getStoredMsgCountFromSim(int32_t serial); - readSmsFromSim(int32_t serial, int32_t index); - writeSmsToSim(int32_t serial, SehSimMsgArgs args); - getCsgList(int32_t serial); - selectCsgManual(int32_t serial, SehCsgInfo info); - setDataAllowed(int32_t serial, bool allowed, SehAllowDataParam ap); - setMobileDataSetting(int32_t serial, bool enabled, bool roamingenabled); - oneway sendRequestRaw(int32_t serial, vec data); - oneway sendRequestStrings(int32_t serial, vec strings); -}; diff --git a/universal7885-common/hidl-packages/interfaces/radio/2.0/ISehRadioIndication.hal b/universal7885-common/hidl-packages/interfaces/radio/2.0/ISehRadioIndication.hal deleted file mode 100644 index 9edd8e6..0000000 --- a/universal7885-common/hidl-packages/interfaces/radio/2.0/ISehRadioIndication.hal +++ /dev/null @@ -1,32 +0,0 @@ -package vendor.samsung.hardware.radio@2.0; - -interface ISehRadioIndication { -oneway acbInfoChanged(int32_t type, vec acbInfo); -oneway csFallback(int32_t type, int32_t state); -oneway imsPreferenceChanged(int32_t type, vec imsPref); -oneway voiceRadioBearerHandoverStatusChanged(int32_t type, int32_t state); -oneway timerStatusChangedInd(int32_t type, vec eventNoti); -oneway modemCapabilityIndication(int32_t type, vec data); -oneway needTurnOnRadioIndication(int32_t type); -oneway simPhonebookReadyIndication(int32_t type); -oneway phonebookInitCompleteIndication(int32_t type); -oneway deviceReadyNoti(int32_t type); -oneway stkSmsSendResultIndication(int32_t type, int32_t reesult); -oneway stkCallControlResultIndication(int32_t type, string cmd); -oneway simSwapStateChangedIndication(int32_t type, int32_t state); -oneway simCountMismatchedIndication(int32_t type, int32_t state); -oneway simOnOffStateChangedNotify(int32_t type, int32_t mode); -oneway releaseCompleteMessageIndication(int32_t type, SehSsReleaseComplete result); -oneway sapNotify(int32_t type, vec data); -oneway nrBearerAllocationChanged(int32_t type, int32_t status); -oneway nrNetworkTypeAdded(int32_t type, int32_t status); -oneway rrcStateChanged(int32_t type, SehRrcStateInfo state); -oneway configModemCapabilityChangeNoti(int32_t type, SehConfigModemCapability configModemCapa); -needApnProfileIndication(string select) generates (SehApnProfile apnProf); -needSettingValueIndication(string key, string table) generates(int32_t xx); -oneway execute(int32_t type, string cmd); -signalLevelInfoChanged(int32_t type, SehSignalBar signalBarInfo); -extendedRegistrationState(int32_t type, SehExtendedRegStateResult state); -needPacketUsage(string iface) generates (int32_t error, SehPacketUsage usage); -nrIconTypeChanged(int32_t indicationType, int32_t nrIconType); -}; diff --git a/universal7885-common/hidl-packages/interfaces/radio/2.0/ISehRadioResponse.hal b/universal7885-common/hidl-packages/interfaces/radio/2.0/ISehRadioResponse.hal deleted file mode 100644 index fde5e6d..0000000 --- a/universal7885-common/hidl-packages/interfaces/radio/2.0/ISehRadioResponse.hal +++ /dev/null @@ -1,48 +0,0 @@ -package vendor.samsung.hardware.radio@2.0; - -import android.hardware.radio@1.0::RadioResponseInfo; - -interface ISehRadioResponse { -oneway getIccCardStatusResponse(RadioResponseInfo info, SehCardStatus cardStatus); -oneway supplyNetworkDepersonalizationResponse(RadioResponseInfo info, int32_t remainingRetries); -oneway dialResponse(RadioResponseInfo info); -oneway getCurrentCallsResponse(RadioResponseInfo info, vec calls); -oneway getImsRegistrationStateResponse(RadioResponseInfo info, vec networkInfos); -oneway setImsCallListResponse(RadioResponseInfo info); -oneway getPreferredNetworkListResponse(RadioResponseInfo info, vec infos); -oneway setPreferredNetworkListResponse(RadioResponseInfo info); -oneway sendEncodedUssdResponse(RadioResponseInfo info); -oneway getDisable2gResponse(RadioResponseInfo info, int32_t isDisable); -oneway setDisable2gResponse(RadioResponseInfo info); -oneway getCnapResponse(RadioResponseInfo info, int32_t m); -oneway getPhonebookStorageInfoResponse(RadioResponseInfo info, SehPhonebookInfo sehinfo); -oneway getUsimPhonebookCapabilityResponse(RadioResponseInfo info, vec phonebookCapability); -oneway setSimOnOffResponse(RadioResponseInfo info); -oneway setSimInitEventResponse(RadioResponseInfo info); -oneway getSimLockInfoResponse(RadioResponseInfo info, SehSimLockInfo simLockInfo); -oneway supplyIccPersonalizationResponse(RadioResponseInfo info); -oneway changeIccPersonalizationResponse(RadioResponseInfo info); -oneway getPhonebookEntryResponse(RadioResponseInfo info, SehSimPhonebookResponse sehinfo); -oneway accessPhonebookEntryResponse(RadioResponseInfo info, int32_t SimPhonmebookAccessResp); -oneway getCellBroadcastConfigResponse(RadioResponseInfo info, SehCbConfigArgs args); -oneway emergencySearchResponse(RadioResponseInfo info, int32_t respEmergencySearch); -oneway emergencyControlResponse(RadioResponseInfo info); -oneway getAtrResponse(RadioResponseInfo info, string atr); -oneway sendCdmaSmsExpectMoreResponse(RadioResponseInfo info, SehSendSmsResult result); -oneway sendSmsResponse(RadioResponseInfo info, SehSendSmsResult result); -oneway sendSMSExpectMoreResponse(RadioResponseInfo info, SehSendSmsResult result); -oneway sendCdmaSmsResponse(RadioResponseInfo info, SehSendSmsResult result); -oneway sendImsSmsResponse(RadioResponseInfo info, SehSendSmsResult result); -oneway getStoredMsgCountFromSimResponse(RadioResponseInfo info, SehStoredMsgCount count); -oneway readSmsFromSimResponse(RadioResponseInfo info, SehSimMsgArgs args); -oneway writeSmsToSimResponse(RadioResponseInfo info, int32_t index); -oneway setDataAllowedResponse(RadioResponseInfo info); -oneway getCsgListResponse(RadioResponseInfo info, vec csginfo); -oneway selectCsgManualResponse(RadioResponseInfo info); -oneway setMobileDataSettingResponse(RadioResponseInfo info); -oneway sendRequestRawResponse(RadioResponseInfo info, vec data); -oneway sendRequestStringsResponse(RadioResponseInfo info, vec data); -oneway setNrModeResponse(RadioResponseInfo responseInfo); -oneway getNrModeResponse(RadioResponseInfo responseInfo, int32_t mode); -oneway getNrIconTypeResponse(RadioResponseInfo responseInfo, int32_t icontype); -}; diff --git a/universal7885-common/hidl-packages/interfaces/radio/2.0/types.hal b/universal7885-common/hidl-packages/interfaces/radio/2.0/types.hal deleted file mode 100644 index 5f6ec03..0000000 --- a/universal7885-common/hidl-packages/interfaces/radio/2.0/types.hal +++ /dev/null @@ -1,225 +0,0 @@ -package vendor.samsung.hardware.radio@2.0; - -import android.hardware.radio@1.0::Call; -import android.hardware.radio@1.0::AppStatus; -import android.hardware.radio@1.0::Dial; -import android.hardware.radio@1.0::OperatorInfo; - -struct SehAdnRecord { - vec name; - int32_t nameDcs; - int32_t nameLength; - string number; - vec gsm8bitEmail; - int32_t gsm8bitEmailLength; - string anr; - string anrA; - string anrB; - string anrC; - vec sne; - int32_t sneLength; - int32_t sneDcs; -}; - -struct SehAllowDataParam { - int32_t defaultDataPhoneId; -}; - -struct SehApnProfile { - string apn; - string proto; - string roamingProto; - string user; - string pw; - string auth; -}; - -struct SehAppStatus { - AppStatus base; - int32_t pin1NumRetries; - int32_t puk1NumRetries; - int32_t pin2NumRetries; - int32_t puk2NumRetries; - int32_t persoUnblockRetries; -}; - -enum SehBearerStatus : int32_t { - NR_BEARER_STATUS_ALLOCATED = 1, - NR_BEARER_STATUS_MMW_ALLOCATED = 2, - NR_BEARER_STATUS_NOT_ALLOCATED = 0, -}; - -enum SehCallType : int32_t { - VOICE = 0, - VS_RX = 2, - VS_TX = 1, - VT = 3, -}; - -struct SehCallDetails { - int32_t callType; - vec extras; -}; - -struct SehCall { - Call base; - int32_t audioQuality; - vec callDetails; -}; - -struct SehCardStatus { - int32_t cardState; - int32_t universalPinState; - int32_t gsmUmtsSubscriptionAppIndex; - int32_t cdmaSubscriptionAppIndex; - int32_t imsSubscriptionAppIndex; - vec applications; - int32_t physicalSlotId; - string atr; - string iccid; -}; - -struct SehCbConfigArgs { - int32_t enabled; - int32_t selectedId; - int32_t msgIdMaxCount; - int32_t msgIdCount; - string msgIDs; -}; - -struct SehCommandExcute { - string mainCmd; - string subCmd; -}; - -struct SehConfigModemCapability { - int32_t supportCltcp; -}; - -struct SehCsgInfo { - int32_t csgId; - string name; - string plmn; - int32_t rat; - int32_t category; - int32_t signalStrength; -}; - -struct SehDial { - Dial base; - vec callDetails; -}; - -struct SehEncodedUssd { - vec encodedUssd; - int32_t ussdLength; - int32_t dcsCode; -}; - -struct SehExtendedRegStateResult { - bool isValid; - int32_t snapshotStatus; - int32_t unprocessedDataRegState; - int32_t unprocessedDataRat; - int32_t mobileOptionalRat; - int32_t imsEmergencyCallBarring; - int32_t unprocessedVoiceRegState; - bool isPsOnlyReg; -}; - -struct SehImsCall { - int32_t state; - int32_t type; - int32_t isMt; - int32_t isMpty; - string number; -}; - -struct SehOperatorInfo { - OperatorInfo base; - string rat; - string lac; -}; - -struct SehPacketUsage { - int64_t rxBytes; - int64_t txBytes; -}; - -struct SehPhonebookInfo { - int32_t totalCount; - int32_t usedCount; - int32_t firstIndex; - int32_t maxTextLength; - int32_t maxNumberLength; -}; - -struct SehPreferredNetworkInfo { - int32_t index; - string oper; - string plmn; - int32_t gsmAct; - int32_t gsmCompactAct; - int32_t utranAct; - int32_t mode; -}; - -struct SehRrcStateInfo { - int32_t rat; - int32_t state; -}; - -struct SehSendSmsResult { - int32_t messageRef; - string ackPDU; - int32_t errorCode; - int32_t errorClass; -}; - -struct SehSignalBar { - int32_t cdmaLevel; - int32_t evdoLevel; - int32_t gsmLevel; - int32_t wcdmaLevel; - int32_t tdscdmaLevel; - int32_t lteLevel; - int32_t nrLevel; -}; - -struct SehSimLockInfo { - int32_t numberOfLockTypes; - int32_t lockType; - int32_t lockKey; - int32_t numberOfRetry; -}; - -struct SehSimMsgArgs { - int32_t index; - int32_t status; - string pdu; - string smsc; -}; - -struct SehSimPhonebookResponse { - vec lengthAlphas; - vec dataTypeAlphas; - vec alphaTags; - vec lengthNumbers; - vec dataTypeNumbers; - vec numbers; - int32_t recordIndex; - int32_t nextIndex; -}; - -struct SehSsReleaseComplete { - int32_t size; - int32_t dataLen; - int32_t params; - int32_t status; - string data; -}; - -struct SehStoredMsgCount { - int32_t usedCount; - int32_t totalCount; -}; diff --git a/universal7885-common/hidl-packages/interfaces/radio/2.1/Android.bp b/universal7885-common/hidl-packages/interfaces/radio/2.1/Android.bp index 57635c9..dcabaaf 100644 --- a/universal7885-common/hidl-packages/interfaces/radio/2.1/Android.bp +++ b/universal7885-common/hidl-packages/interfaces/radio/2.1/Android.bp @@ -7,12 +7,14 @@ hidl_interface { "ISehRadio.hal", "ISehRadioIndication.hal", "ISehRadioResponse.hal", - "types.hal" ], interfaces: [ "android.hardware.radio@1.0", + "android.hardware.radio@1.1", + "android.hardware.radio@1.2", + "android.hardware.radio@1.3", + "android.hardware.radio@1.4", "android.hidl.base@1.0", - "vendor.samsung.hardware.radio@2.0", ], gen_java: true, } diff --git a/universal7885-common/hidl-packages/interfaces/radio/2.1/ISehRadio.hal b/universal7885-common/hidl-packages/interfaces/radio/2.1/ISehRadio.hal index 5618d93..d6b1ec7 100644 --- a/universal7885-common/hidl-packages/interfaces/radio/2.1/ISehRadio.hal +++ b/universal7885-common/hidl-packages/interfaces/radio/2.1/ISehRadio.hal @@ -1,9 +1,5 @@ package vendor.samsung.hardware.radio@2.1; -import vendor.samsung.hardware.radio@2.0::ISehRadio; +import android.hardware.radio@1.4::IRadio; -interface ISehRadio extends @2.0::ISehRadio { -oneway setNrMode(int32_t serial, int32_t mode); -oneway getNrMode(int32_t serial); -oneway getNrIconType(int32_t serial); -}; +interface ISehRadio extends IRadio {}; diff --git a/universal7885-common/hidl-packages/interfaces/radio/2.1/ISehRadioIndication.hal b/universal7885-common/hidl-packages/interfaces/radio/2.1/ISehRadioIndication.hal index cd29265..de725d2 100644 --- a/universal7885-common/hidl-packages/interfaces/radio/2.1/ISehRadioIndication.hal +++ b/universal7885-common/hidl-packages/interfaces/radio/2.1/ISehRadioIndication.hal @@ -1,5 +1,5 @@ package vendor.samsung.hardware.radio@2.1; -import @2.0::ISehRadioIndication; +import android.hardware.radio@1.4::IRadioIndication; -interface ISehRadioIndication extends @2.0::ISehRadioIndication {}; +interface ISehRadioIndication extends IRadioIndication {}; diff --git a/universal7885-common/hidl-packages/interfaces/radio/2.1/ISehRadioResponse.hal b/universal7885-common/hidl-packages/interfaces/radio/2.1/ISehRadioResponse.hal index 84a8e31..f3d5ded 100644 --- a/universal7885-common/hidl-packages/interfaces/radio/2.1/ISehRadioResponse.hal +++ b/universal7885-common/hidl-packages/interfaces/radio/2.1/ISehRadioResponse.hal @@ -1,5 +1,5 @@ package vendor.samsung.hardware.radio@2.1; -import @2.0::ISehRadioResponse; +import android.hardware.radio@1.4::IRadioResponse; -interface ISehRadioResponse extends @2.0::ISehRadioResponse {}; +interface ISehRadioResponse extends IRadioResponse {}; diff --git a/universal7885-common/hidl-packages/interfaces/radio/2.1/types.hal b/universal7885-common/hidl-packages/interfaces/radio/2.1/types.hal deleted file mode 100644 index 69c209e..0000000 --- a/universal7885-common/hidl-packages/interfaces/radio/2.1/types.hal +++ /dev/null @@ -1,9 +0,0 @@ -package vendor.samsung.hardware.radio@2.1; - -import @2.0::SehCardStatus; - -struct SehCardStatus { - @2.0::SehCardStatus base; - string eid; -}; - diff --git a/universal7885-common/hidl-packages/interfaces/radio/channel/2.0/Android.bp b/universal7885-common/hidl-packages/interfaces/radio/channel/2.0/Android.bp deleted file mode 100644 index 8891b11..0000000 --- a/universal7885-common/hidl-packages/interfaces/radio/channel/2.0/Android.bp +++ /dev/null @@ -1,14 +0,0 @@ -// This file is autogenerated by hidl-gen -Landroidbp. - -hidl_interface { - name: "vendor.samsung.hardware.radio.channel@2.0", - root: "vendor.samsung.hardware", - srcs: [ - "ISehChannel.hal", - "ISehChannelCallback.hal", - ], - interfaces: [ - "android.hidl.base@1.0", - ], - gen_java: true, -} diff --git a/universal7885-common/hidl-packages/interfaces/radio/channel/2.0/ISehChannel.hal b/universal7885-common/hidl-packages/interfaces/radio/channel/2.0/ISehChannel.hal deleted file mode 100644 index 7ff874f..0000000 --- a/universal7885-common/hidl-packages/interfaces/radio/channel/2.0/ISehChannel.hal +++ /dev/null @@ -1,8 +0,0 @@ -package vendor.samsung.hardware.radio.channel@2.0; - -import @2.0::ISehChannelCallback; - -interface ISehChannel { - oneway send(vec data); - oneway setCallback(ISehChannelCallback callback); -}; diff --git a/universal7885-common/hidl-packages/interfaces/radio/channel/2.0/ISehChannelCallback.hal b/universal7885-common/hidl-packages/interfaces/radio/channel/2.0/ISehChannelCallback.hal deleted file mode 100644 index c6c36c7..0000000 --- a/universal7885-common/hidl-packages/interfaces/radio/channel/2.0/ISehChannelCallback.hal +++ /dev/null @@ -1,5 +0,0 @@ -package vendor.samsung.hardware.radio.channel@2.0; - -interface ISehChannelCallback { - oneway receive(vec data); -};