From f168f0b364acf334ed1e3c936b5d6b0f8993443d Mon Sep 17 00:00:00 2001 From: Malcolm Chen Date: Mon, 26 Nov 2018 15:16:10 -0800 Subject: [PATCH] Migration of IRadio 1.3 types to 1.4. To better test CBRS, we want IRadio 1.3 to be Android P plus CBRS HAL interfaces, while 1.4 will be 1.3 plus all other Android Q interfaces. So we are creating V1_4 folder and moving everything currently defined in android.hardware.radio.V1_3 there. Part 2: re-create 1.3 folder. Bug: 117805040 Test: build and telephony unittest Change-Id: If177cd24d8275e22c18d9b5b907cd65ac13a4461 Merged-In: If177cd24d8275e22c18d9b5b907cd65ac13a4461 --- radio/1.3/Android.bp | 22 ++++++++++++++++++++++ radio/1.3/IRadio.hal | 30 ++++++++++++++++++++++++++++++ radio/1.3/IRadioIndication.hal | 25 +++++++++++++++++++++++++ radio/1.3/IRadioResponse.hal | 25 +++++++++++++++++++++++++ 4 files changed, 102 insertions(+) create mode 100644 radio/1.3/Android.bp create mode 100644 radio/1.3/IRadio.hal create mode 100644 radio/1.3/IRadioIndication.hal create mode 100644 radio/1.3/IRadioResponse.hal diff --git a/radio/1.3/Android.bp b/radio/1.3/Android.bp new file mode 100644 index 0000000000..30b8edfda7 --- /dev/null +++ b/radio/1.3/Android.bp @@ -0,0 +1,22 @@ +// This file is autogenerated by hidl-gen -Landroidbp. + +hidl_interface { + name: "android.hardware.radio@1.3", + root: "android.hardware", + vndk: { + enabled: true, + }, + srcs: [ + "IRadio.hal", + "IRadioIndication.hal", + "IRadioResponse.hal", + ], + interfaces: [ + "android.hardware.radio@1.0", + "android.hardware.radio@1.1", + "android.hardware.radio@1.2", + "android.hidl.base@1.0", + ], + gen_java: true, +} + diff --git a/radio/1.3/IRadio.hal b/radio/1.3/IRadio.hal new file mode 100644 index 0000000000..d582c71ec8 --- /dev/null +++ b/radio/1.3/IRadio.hal @@ -0,0 +1,30 @@ +/* + * 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@1.3; + +import @1.2::IRadio; + +/** + * This interface is used by telephony and telecom to talk to cellular radio. + * All the functions have minimum one parameter: + * serial: which corresponds to serial no. of request. Serial numbers must only be memorized for the + * duration of a method call. If clients provide colliding serials (including passing the same + * serial to different methods), multiple responses (one for each method call) must still be served. + * setResponseFunctions must work with @1.1::IRadioResponse and @1.1::IRadioIndication. + */ +interface IRadio extends @1.2::IRadio { +}; diff --git a/radio/1.3/IRadioIndication.hal b/radio/1.3/IRadioIndication.hal new file mode 100644 index 0000000000..b65d3f2bf5 --- /dev/null +++ b/radio/1.3/IRadioIndication.hal @@ -0,0 +1,25 @@ +/* + * 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@1.3; + +import @1.2::IRadioIndication; + +/** + * Interface declaring unsolicited radio indications. + */ +interface IRadioIndication extends @1.2::IRadioIndication { +}; diff --git a/radio/1.3/IRadioResponse.hal b/radio/1.3/IRadioResponse.hal new file mode 100644 index 0000000000..2bcdd029b9 --- /dev/null +++ b/radio/1.3/IRadioResponse.hal @@ -0,0 +1,25 @@ +/* + * 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@1.3; + +import @1.2::IRadioResponse; + +/** + * Interface declaring response functions to solicited radio requests. + */ +interface IRadioResponse extends @1.2::IRadioResponse { +};