From 00707641c09f30fa243abbc22b59590ee07dfe00 Mon Sep 17 00:00:00 2001 From: Malcolm Chen Date: Mon, 26 Nov 2018 08:55:24 -0800 Subject: [PATCH] Migration of IRadioConfig 1.1 types to 1.2. To better test CBRS, we want IRadio 1.1 to be Android P plus CBRS HAL interfaces, while 1.2 will be 1.1 plus all other Android Q interfaces. So we are creating V1_2 folder and moving everything currently defined in android.hardware.radio.config.V1_1 there. Bug: 117805040 Test: build and telephony unittest Change-Id: Ia221258b62351d1190e78fa0e5faafc36163f4a9 --- radio/config/1.1/Android.bp | 4 -- radio/config/1.1/IRadioConfigIndication.hal | 14 ------- radio/config/1.1/IRadioConfigResponse.hal | 16 -------- radio/config/1.2/Android.bp | 24 ++++++++++++ radio/config/1.2/IRadioConfigIndication.hal | 39 ++++++++++++++++++++ radio/config/1.2/IRadioConfigResponse.hal | 41 +++++++++++++++++++++ radio/config/{1.1 => 1.2}/types.hal | 4 +- 7 files changed, 106 insertions(+), 36 deletions(-) create mode 100644 radio/config/1.2/Android.bp create mode 100644 radio/config/1.2/IRadioConfigIndication.hal create mode 100644 radio/config/1.2/IRadioConfigResponse.hal rename radio/config/{1.1 => 1.2}/types.hal (95%) diff --git a/radio/config/1.1/Android.bp b/radio/config/1.1/Android.bp index 8dc0f27975..f228704bca 100644 --- a/radio/config/1.1/Android.bp +++ b/radio/config/1.1/Android.bp @@ -7,7 +7,6 @@ hidl_interface { enabled: true, }, srcs: [ - "types.hal", "IRadioConfigIndication.hal", "IRadioConfigResponse.hal", ], @@ -16,8 +15,5 @@ hidl_interface { "android.hardware.radio.config@1.0", "android.hidl.base@1.0", ], - types: [ - "SimSlotStatus", - ], gen_java: true, } diff --git a/radio/config/1.1/IRadioConfigIndication.hal b/radio/config/1.1/IRadioConfigIndication.hal index 53eaa4de0f..f919201491 100644 --- a/radio/config/1.1/IRadioConfigIndication.hal +++ b/radio/config/1.1/IRadioConfigIndication.hal @@ -17,23 +17,9 @@ package android.hardware.radio.config@1.1; import @1.0::IRadioConfigIndication; -import android.hardware.radio@1.0::RadioIndicationType; /** * Interface declaring unsolicited radio config indications. */ interface IRadioConfigIndication extends @1.0::IRadioConfigIndication { - - /** - * Indicates SIM slot status change. - * - * This indication must be sent by the modem whenever there is any slot status change, even the - * slot is inactive. For example, this indication must be triggered if a SIM card is inserted - * into an inactive slot. - * - * @param type Type of radio indication - * @param slotStatus new slot status info with size equals to the number of physical slots on - * the device - */ - oneway simSlotsStatusChanged_1_1(RadioIndicationType type, vec slotStatus); }; diff --git a/radio/config/1.1/IRadioConfigResponse.hal b/radio/config/1.1/IRadioConfigResponse.hal index 6f543abfa5..5d7560062a 100644 --- a/radio/config/1.1/IRadioConfigResponse.hal +++ b/radio/config/1.1/IRadioConfigResponse.hal @@ -16,26 +16,10 @@ package android.hardware.radio.config@1.1; -import android.hardware.radio@1.0::RadioResponseInfo; import @1.0::IRadioConfigResponse; -import @1.1::SimSlotStatus; /** * Interface declaring response functions to solicited radio config requests. */ interface IRadioConfigResponse extends @1.0::IRadioConfigResponse { - - /** - * @param info Response info struct containing response type, serial no. and error - * @param slotStatus Sim slot struct containing all the physical SIM slots info with size - * equal to the number of physical slots on the device - * - * Valid errors returned: - * RadioError:NONE - * RadioError:RADIO_NOT_AVAILABLE - * RadioError:NO_MEMORY - * RadioError:INTERNAL_ERR - * RadioError:MODEM_ERR - */ - oneway getSimSlotsStatusResponse_1_1(RadioResponseInfo info, vec slotStatus); }; diff --git a/radio/config/1.2/Android.bp b/radio/config/1.2/Android.bp new file mode 100644 index 0000000000..c1eeb35a44 --- /dev/null +++ b/radio/config/1.2/Android.bp @@ -0,0 +1,24 @@ +// This file is autogenerated by hidl-gen -Landroidbp. + +hidl_interface { + name: "android.hardware.radio.config@1.2", + root: "android.hardware", + vndk: { + enabled: true, + }, + srcs: [ + "types.hal", + "IRadioConfigIndication.hal", + "IRadioConfigResponse.hal", + ], + interfaces: [ + "android.hardware.radio@1.0", + "android.hardware.radio.config@1.0", + "android.hardware.radio.config@1.1", + "android.hidl.base@1.0", + ], + types: [ + "SimSlotStatus", + ], + gen_java: true, +} diff --git a/radio/config/1.2/IRadioConfigIndication.hal b/radio/config/1.2/IRadioConfigIndication.hal new file mode 100644 index 0000000000..a3ae558973 --- /dev/null +++ b/radio/config/1.2/IRadioConfigIndication.hal @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.hardware.radio.config@1.2; + +import android.hardware.radio@1.0::RadioIndicationType; +import @1.1::IRadioConfigIndication; + +/** + * Interface declaring unsolicited radio config indications. + */ +interface IRadioConfigIndication extends @1.1::IRadioConfigIndication { + + /** + * Indicates SIM slot status change. + * + * This indication must be sent by the modem whenever there is any slot status change, even the + * slot is inactive. For example, this indication must be triggered if a SIM card is inserted + * into an inactive slot. + * + * @param type Type of radio indication + * @param slotStatus new slot status info with size equals to the number of physical slots on + * the device + */ + oneway simSlotsStatusChanged_1_2(RadioIndicationType type, vec slotStatus); +}; \ No newline at end of file diff --git a/radio/config/1.2/IRadioConfigResponse.hal b/radio/config/1.2/IRadioConfigResponse.hal new file mode 100644 index 0000000000..dbc3bc556e --- /dev/null +++ b/radio/config/1.2/IRadioConfigResponse.hal @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.hardware.radio.config@1.2; + +import android.hardware.radio@1.0::RadioResponseInfo; +import @1.1::IRadioConfigResponse; +import @1.2::SimSlotStatus; + +/** + * Interface declaring response functions to solicited radio config requests. + */ +interface IRadioConfigResponse extends @1.1::IRadioConfigResponse { + + /** + * @param info Response info struct containing response type, serial no. and error + * @param slotStatus Sim slot struct containing all the physical SIM slots info with size + * equal to the number of physical slots on the device + * + * Valid errors returned: + * RadioError:NONE + * RadioError:RADIO_NOT_AVAILABLE + * RadioError:NO_MEMORY + * RadioError:INTERNAL_ERR + * RadioError:MODEM_ERR + */ + oneway getSimSlotsStatusResponse_1_2(RadioResponseInfo info, vec slotStatus); +}; \ No newline at end of file diff --git a/radio/config/1.1/types.hal b/radio/config/1.2/types.hal similarity index 95% rename from radio/config/1.1/types.hal rename to radio/config/1.2/types.hal index 0c9d11efed..5b809a78b5 100644 --- a/radio/config/1.1/types.hal +++ b/radio/config/1.2/types.hal @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.hardware.radio.config@1.1; +package android.hardware.radio.config@1.2; import android.hardware.radio@1.0::CardState; import @1.0::SimSlotStatus; @@ -29,4 +29,4 @@ struct SimSlotStatus { * supports eUICC. */ string eid; -}; +}; \ No newline at end of file