diff options
author | timtmlin <timtmlin@google.com> | 2023-02-09 13:12:45 +0000 |
---|---|---|
committer | timtmlin <timtmlin@google.com> | 2023-02-09 13:14:52 +0000 |
commit | 01084acf50ee112989082d53f5b68a9902beedd9 (patch) | |
tree | efc58ef304e81e64a696e6afb8854b802560f62d | |
parent | a24113bd4a9d903cd04ffce31fa2834238beb658 (diff) | |
download | interfaces-01084acf50ee112989082d53f5b68a9902beedd9.tar.gz |
move IRilExt from internal folder
To fix build breakage on PDK
Bug: 258184594
Test: make
Change-Id: Ib9cff6361ad106332fc26935a56e8fc85c725ad8
13 files changed, 491 insertions, 0 deletions
diff --git a/ril_ext/Android.bp b/ril_ext/Android.bp new file mode 100644 index 0000000..63ecd37 --- /dev/null +++ b/ril_ext/Android.bp @@ -0,0 +1,22 @@ +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + +aidl_interface { + name: "hardware.google.ril_ext", + owner: "google", + vendor_available: true, + srcs: ["hardware/google/ril_ext/*.aidl"], + stability: "vintf", + backend: { + cpp: { + enabled: true, + }, + java: { + sdk_version: "module_current", + }, + ndk: { + enabled: true, + }, + }, +} diff --git a/ril_ext/aidl_api/hardware.google.ril_ext/current/hardware/google/ril_ext/CarrierConfig.aidl b/ril_ext/aidl_api/hardware.google.ril_ext/current/hardware/google/ril_ext/CarrierConfig.aidl new file mode 100644 index 0000000..b863898 --- /dev/null +++ b/ril_ext/aidl_api/hardware.google.ril_ext/current/hardware/google/ril_ext/CarrierConfig.aidl @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2023 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. + */ +/////////////////////////////////////////////////////////////////////////////// +// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // +/////////////////////////////////////////////////////////////////////////////// + +// This file is a snapshot of an AIDL file. Do not edit it manually. There are +// two cases: +// 1). this is a frozen version file - do not edit this in any case. +// 2). this is a 'current' file. If you make a backwards compatible change to +// the interface (from the latest frozen version), the build system will +// prompt you to update this file with `m <name>-update-api`. +// +// You must not make a backward incompatible change to any AIDL file built +// with the aidl_interface module type with versions property set. The module +// type is used to build AIDL files in a way that they can be used across +// independently updatable components of the system. If a device is shipped +// with such a backward incompatible change, it has a high risk of breaking +// later when a module using the interface is updated, e.g., Mainline modules. + +package hardware.google.ril_ext; +@VintfStability +parcelable CarrierConfig { + String configKey; + hardware.google.ril_ext.CarrierConfig.ConfigValue configValue; + union ConfigValue { + boolean boolValue; + boolean[] boolArray; + int intValue; + int[] intArray; + long longValue; + long[] longArray; + String stringValue; + String[] stringArray; + } +} diff --git a/ril_ext/aidl_api/hardware.google.ril_ext/current/hardware/google/ril_ext/IRilExt.aidl b/ril_ext/aidl_api/hardware.google.ril_ext/current/hardware/google/ril_ext/IRilExt.aidl new file mode 100644 index 0000000..7dcbfa1 --- /dev/null +++ b/ril_ext/aidl_api/hardware.google.ril_ext/current/hardware/google/ril_ext/IRilExt.aidl @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2023 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. + */ +/////////////////////////////////////////////////////////////////////////////// +// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // +/////////////////////////////////////////////////////////////////////////////// + +// This file is a snapshot of an AIDL file. Do not edit it manually. There are +// two cases: +// 1). this is a frozen version file - do not edit this in any case. +// 2). this is a 'current' file. If you make a backwards compatible change to +// the interface (from the latest frozen version), the build system will +// prompt you to update this file with `m <name>-update-api`. +// +// You must not make a backward incompatible change to any AIDL file built +// with the aidl_interface module type with versions property set. The module +// type is used to build AIDL files in a way that they can be used across +// independently updatable components of the system. If a device is shipped +// with such a backward incompatible change, it has a high risk of breaking +// later when a module using the interface is updated, e.g., Mainline modules. + +package hardware.google.ril_ext; +@VintfStability +interface IRilExt { + void setCallback(in hardware.google.ril_ext.IRilExtResponse rilExtResponse, in hardware.google.ril_ext.IRilExtIndication rilExtIndication); + void sendCarrierId(in int serial, in int carrierId); + void sendCarrierConfigs(in int serial, in hardware.google.ril_ext.CarrierConfig[] carrierConfigs); +} diff --git a/ril_ext/aidl_api/hardware.google.ril_ext/current/hardware/google/ril_ext/IRilExtIndication.aidl b/ril_ext/aidl_api/hardware.google.ril_ext/current/hardware/google/ril_ext/IRilExtIndication.aidl new file mode 100644 index 0000000..2db2705 --- /dev/null +++ b/ril_ext/aidl_api/hardware.google.ril_ext/current/hardware/google/ril_ext/IRilExtIndication.aidl @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2023 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. + */ +/////////////////////////////////////////////////////////////////////////////// +// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // +/////////////////////////////////////////////////////////////////////////////// + +// This file is a snapshot of an AIDL file. Do not edit it manually. There are +// two cases: +// 1). this is a frozen version file - do not edit this in any case. +// 2). this is a 'current' file. If you make a backwards compatible change to +// the interface (from the latest frozen version), the build system will +// prompt you to update this file with `m <name>-update-api`. +// +// You must not make a backward incompatible change to any AIDL file built +// with the aidl_interface module type with versions property set. The module +// type is used to build AIDL files in a way that they can be used across +// independently updatable components of the system. If a device is shipped +// with such a backward incompatible change, it has a high risk of breaking +// later when a module using the interface is updated, e.g., Mainline modules. + +package hardware.google.ril_ext; +@VintfStability +interface IRilExtIndication { + void registerCarrierConfigChange(in String[] registeredKeys, in String[] unregisteredKeys); + void triggerBugreport(in String title); +} diff --git a/ril_ext/aidl_api/hardware.google.ril_ext/current/hardware/google/ril_ext/IRilExtResponse.aidl b/ril_ext/aidl_api/hardware.google.ril_ext/current/hardware/google/ril_ext/IRilExtResponse.aidl new file mode 100644 index 0000000..a5dfb2b --- /dev/null +++ b/ril_ext/aidl_api/hardware.google.ril_ext/current/hardware/google/ril_ext/IRilExtResponse.aidl @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2023 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. + */ +/////////////////////////////////////////////////////////////////////////////// +// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // +/////////////////////////////////////////////////////////////////////////////// + +// This file is a snapshot of an AIDL file. Do not edit it manually. There are +// two cases: +// 1). this is a frozen version file - do not edit this in any case. +// 2). this is a 'current' file. If you make a backwards compatible change to +// the interface (from the latest frozen version), the build system will +// prompt you to update this file with `m <name>-update-api`. +// +// You must not make a backward incompatible change to any AIDL file built +// with the aidl_interface module type with versions property set. The module +// type is used to build AIDL files in a way that they can be used across +// independently updatable components of the system. If a device is shipped +// with such a backward incompatible change, it has a high risk of breaking +// later when a module using the interface is updated, e.g., Mainline modules. + +package hardware.google.ril_ext; +@VintfStability +interface IRilExtResponse { + void sendCarrierIdResponse(in hardware.google.ril_ext.RilResponseInfo info); + void sendCarrierConfigsResponse(in hardware.google.ril_ext.RilResponseInfo info); +} diff --git a/ril_ext/aidl_api/hardware.google.ril_ext/current/hardware/google/ril_ext/RilError.aidl b/ril_ext/aidl_api/hardware.google.ril_ext/current/hardware/google/ril_ext/RilError.aidl new file mode 100644 index 0000000..66ec05f --- /dev/null +++ b/ril_ext/aidl_api/hardware.google.ril_ext/current/hardware/google/ril_ext/RilError.aidl @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2023 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. + */ +/////////////////////////////////////////////////////////////////////////////// +// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // +/////////////////////////////////////////////////////////////////////////////// + +// This file is a snapshot of an AIDL file. Do not edit it manually. There are +// two cases: +// 1). this is a frozen version file - do not edit this in any case. +// 2). this is a 'current' file. If you make a backwards compatible change to +// the interface (from the latest frozen version), the build system will +// prompt you to update this file with `m <name>-update-api`. +// +// You must not make a backward incompatible change to any AIDL file built +// with the aidl_interface module type with versions property set. The module +// type is used to build AIDL files in a way that they can be used across +// independently updatable components of the system. If a device is shipped +// with such a backward incompatible change, it has a high risk of breaking +// later when a module using the interface is updated, e.g., Mainline modules. + +package hardware.google.ril_ext; +@Backing(type="int") @JavaDerive(toString=true) @VintfStability +enum RilError { + NONE = 0, + GENERIC_FAILURE = 1, + REQUEST_NOT_SUPPORTED = 2, + NO_MEMORY = 3, +} diff --git a/ril_ext/aidl_api/hardware.google.ril_ext/current/hardware/google/ril_ext/RilResponseInfo.aidl b/ril_ext/aidl_api/hardware.google.ril_ext/current/hardware/google/ril_ext/RilResponseInfo.aidl new file mode 100644 index 0000000..88e8648 --- /dev/null +++ b/ril_ext/aidl_api/hardware.google.ril_ext/current/hardware/google/ril_ext/RilResponseInfo.aidl @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2023 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. + */ +/////////////////////////////////////////////////////////////////////////////// +// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // +/////////////////////////////////////////////////////////////////////////////// + +// This file is a snapshot of an AIDL file. Do not edit it manually. There are +// two cases: +// 1). this is a frozen version file - do not edit this in any case. +// 2). this is a 'current' file. If you make a backwards compatible change to +// the interface (from the latest frozen version), the build system will +// prompt you to update this file with `m <name>-update-api`. +// +// You must not make a backward incompatible change to any AIDL file built +// with the aidl_interface module type with versions property set. The module +// type is used to build AIDL files in a way that they can be used across +// independently updatable components of the system. If a device is shipped +// with such a backward incompatible change, it has a high risk of breaking +// later when a module using the interface is updated, e.g., Mainline modules. + +package hardware.google.ril_ext; +@JavaDerive(toString=true) @VintfStability +parcelable RilResponseInfo { + int serial; + hardware.google.ril_ext.RilError error; +} diff --git a/ril_ext/hardware/google/ril_ext/CarrierConfig.aidl b/ril_ext/hardware/google/ril_ext/CarrierConfig.aidl new file mode 100644 index 0000000..37d89b7 --- /dev/null +++ b/ril_ext/hardware/google/ril_ext/CarrierConfig.aidl @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2023 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 hardware.google.ril_ext; + +@VintfStability +parcelable CarrierConfig { + union ConfigValue { + boolean boolValue; + boolean[] boolArray; + int intValue; + int[] intArray; + long longValue; + long[] longArray; + String stringValue; + String[] stringArray; + } + + /** + * The name of the carrier config. + */ + String configKey; + /** + * The config value associated with the configKey. + */ + ConfigValue configValue; +} diff --git a/ril_ext/hardware/google/ril_ext/IRilExt.aidl b/ril_ext/hardware/google/ril_ext/IRilExt.aidl new file mode 100644 index 0000000..71fc580 --- /dev/null +++ b/ril_ext/hardware/google/ril_ext/IRilExt.aidl @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2023 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 hardware.google.ril_ext; + +import hardware.google.ril_ext.CarrierConfig; + +@VintfStability +interface IRilExt { + /** + * Set response functions for requests and indications. + * + * @param rilExtResponse Object containing response functions + * @param rilExtIndication Object containing radio indications + */ + void setCallback(in hardware.google.ril_ext.IRilExtResponse rilExtResponse, + in hardware.google.ril_ext.IRilExtIndication rilExtIndication); + /** + * Set carrier ID to RIL HAL. + * + * @param serial Serial number of request + * @param carrierId Android carrier ID + * + * Response function is IRilExtResponse.sendCarrierIdResponse() + */ + void sendCarrierId(in int serial, in int carrierId); + /** + * Forward a list of the interested carrier configuration to RIL HAL. + * + * @param serial Serial number of request + * @param carrierConfigs A list of carrier configs which are key/value pairs + * + * Response function is IRilExtResponse.sendCarrierConfigsResponse(). + */ + void sendCarrierConfigs(in int serial, in CarrierConfig[] carrierConfigs); +} diff --git a/ril_ext/hardware/google/ril_ext/IRilExtIndication.aidl b/ril_ext/hardware/google/ril_ext/IRilExtIndication.aidl new file mode 100644 index 0000000..16c0ca1 --- /dev/null +++ b/ril_ext/hardware/google/ril_ext/IRilExtIndication.aidl @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2023 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 hardware.google.ril_ext; + +@VintfStability +interface IRilExtIndication { + /** + * Register or unregister the interested carrier configurations. + * + * @param registeredKeys A list of the interested carrier configurations + * @param unregisteredKeys A list of the uninterested carrier configurations + */ + void registerCarrierConfigChange(in String[] registeredKeys, in String[] unregisteredKeys); + /** + * Trigger bugreport to report RIL issues. + * + * @param title The title of the bugreport + */ + void triggerBugreport(in String title); +} diff --git a/ril_ext/hardware/google/ril_ext/IRilExtResponse.aidl b/ril_ext/hardware/google/ril_ext/IRilExtResponse.aidl new file mode 100644 index 0000000..e662458 --- /dev/null +++ b/ril_ext/hardware/google/ril_ext/IRilExtResponse.aidl @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2023 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 hardware.google.ril_ext; + +import hardware.google.ril_ext.RilResponseInfo; + +@VintfStability +interface IRilExtResponse { + /** + * @param info Response info struct containing serial no. and error + */ + void sendCarrierIdResponse(in RilResponseInfo info); + /** + * @param info Response info struct containing serial no. and error + */ + void sendCarrierConfigsResponse(in RilResponseInfo info); +} diff --git a/ril_ext/hardware/google/ril_ext/RilError.aidl b/ril_ext/hardware/google/ril_ext/RilError.aidl new file mode 100644 index 0000000..a508d8f --- /dev/null +++ b/ril_ext/hardware/google/ril_ext/RilError.aidl @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2023 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 hardware.google.ril_ext; + +@VintfStability +@Backing(type="int") +@JavaDerive(toString=true) +enum RilError { + /** + * Success + */ + NONE = 0, + GENERIC_FAILURE = 1, + /** + * Optional API + */ + REQUEST_NOT_SUPPORTED = 2, + /** + * Not sufficieent memory to process the request + */ + NO_MEMORY = 3, +} diff --git a/ril_ext/hardware/google/ril_ext/RilResponseInfo.aidl b/ril_ext/hardware/google/ril_ext/RilResponseInfo.aidl new file mode 100644 index 0000000..f258376 --- /dev/null +++ b/ril_ext/hardware/google/ril_ext/RilResponseInfo.aidl @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2023 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 hardware.google.ril_ext; + +import hardware.google.ril_ext.RilError; + +@VintfStability +@JavaDerive(toString=true) +parcelable RilResponseInfo { + /** + * Serial number of the request + */ + int serial; + /** + * Response error + */ + RilError error; +} |