diff --git a/staticlibs/netd/Android.bp b/staticlibs/netd/Android.bp index 637a938589..2b7e620705 100644 --- a/staticlibs/netd/Android.bp +++ b/staticlibs/netd/Android.bp @@ -241,5 +241,17 @@ aidl_interface { min_sdk_version: "30", }, }, - versions: ["1"], + versions_with_info: [ + { + version: "1", + imports: [], + }, + { + version: "2", + imports: [], + }, + + ], + frozen: true, + } diff --git a/staticlibs/netd/aidl_api/mdns_aidl_interface/2/.hash b/staticlibs/netd/aidl_api/mdns_aidl_interface/2/.hash new file mode 100644 index 0000000000..785d42da98 --- /dev/null +++ b/staticlibs/netd/aidl_api/mdns_aidl_interface/2/.hash @@ -0,0 +1 @@ +0e5d9ad0664b8b3ec9d323534c42333cf6f6ed3d diff --git a/staticlibs/netd/aidl_api/mdns_aidl_interface/2/android/net/mdns/aidl/DiscoveryInfo.aidl b/staticlibs/netd/aidl_api/mdns_aidl_interface/2/android/net/mdns/aidl/DiscoveryInfo.aidl new file mode 100644 index 0000000000..d31a327893 --- /dev/null +++ b/staticlibs/netd/aidl_api/mdns_aidl_interface/2/android/net/mdns/aidl/DiscoveryInfo.aidl @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2022 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 -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 android.net.mdns.aidl; +/* @hide */ +@JavaDerive(equals=true, toString=true) @JavaOnlyImmutable +parcelable DiscoveryInfo { + int id; + int result; + @utf8InCpp String serviceName; + @utf8InCpp String registrationType; + @utf8InCpp String domainName; + int interfaceIdx; + int netId; +} diff --git a/staticlibs/netd/aidl_api/mdns_aidl_interface/2/android/net/mdns/aidl/GetAddressInfo.aidl b/staticlibs/netd/aidl_api/mdns_aidl_interface/2/android/net/mdns/aidl/GetAddressInfo.aidl new file mode 100644 index 0000000000..2049274454 --- /dev/null +++ b/staticlibs/netd/aidl_api/mdns_aidl_interface/2/android/net/mdns/aidl/GetAddressInfo.aidl @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2022 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 -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 android.net.mdns.aidl; +/* @hide */ +@JavaDerive(equals=true, toString=true) @JavaOnlyImmutable +parcelable GetAddressInfo { + int id; + int result; + @utf8InCpp String hostname; + @utf8InCpp String address; + int interfaceIdx; + int netId; +} diff --git a/staticlibs/netd/aidl_api/mdns_aidl_interface/2/android/net/mdns/aidl/IMDns.aidl b/staticlibs/netd/aidl_api/mdns_aidl_interface/2/android/net/mdns/aidl/IMDns.aidl new file mode 100644 index 0000000000..d84742bcd2 --- /dev/null +++ b/staticlibs/netd/aidl_api/mdns_aidl_interface/2/android/net/mdns/aidl/IMDns.aidl @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2022 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 -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 android.net.mdns.aidl; +/* @hide */ +interface IMDns { + /** + * @deprecated unimplemented on V+. + */ + void startDaemon(); + /** + * @deprecated unimplemented on V+. + */ + void stopDaemon(); + /** + * @deprecated unimplemented on U+. + */ + void registerService(in android.net.mdns.aidl.RegistrationInfo info); + /** + * @deprecated unimplemented on U+. + */ + void discover(in android.net.mdns.aidl.DiscoveryInfo info); + /** + * @deprecated unimplemented on U+. + */ + void resolve(in android.net.mdns.aidl.ResolutionInfo info); + /** + * @deprecated unimplemented on U+. + */ + void getServiceAddress(in android.net.mdns.aidl.GetAddressInfo info); + /** + * @deprecated unimplemented on U+. + */ + void stopOperation(int id); + /** + * @deprecated unimplemented on U+. + */ + void registerEventListener(in android.net.mdns.aidl.IMDnsEventListener listener); + /** + * @deprecated unimplemented on U+. + */ + void unregisterEventListener(in android.net.mdns.aidl.IMDnsEventListener listener); +} diff --git a/staticlibs/netd/aidl_api/mdns_aidl_interface/2/android/net/mdns/aidl/IMDnsEventListener.aidl b/staticlibs/netd/aidl_api/mdns_aidl_interface/2/android/net/mdns/aidl/IMDnsEventListener.aidl new file mode 100644 index 0000000000..187a3d26dd --- /dev/null +++ b/staticlibs/netd/aidl_api/mdns_aidl_interface/2/android/net/mdns/aidl/IMDnsEventListener.aidl @@ -0,0 +1,62 @@ +/** + * Copyright (c) 2022, 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 -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 android.net.mdns.aidl; +/* @hide */ +interface IMDnsEventListener { + /** + * @deprecated this is implemented for backward compatibility. Don't use it in new code. + */ + oneway void onServiceRegistrationStatus(in android.net.mdns.aidl.RegistrationInfo status); + /** + * @deprecated this is implemented for backward compatibility. Don't use it in new code. + */ + oneway void onServiceDiscoveryStatus(in android.net.mdns.aidl.DiscoveryInfo status); + /** + * @deprecated this is implemented for backward compatibility. Don't use it in new code. + */ + oneway void onServiceResolutionStatus(in android.net.mdns.aidl.ResolutionInfo status); + /** + * @deprecated this is implemented for backward compatibility. Don't use it in new code. + */ + oneway void onGettingServiceAddressStatus(in android.net.mdns.aidl.GetAddressInfo status); + const int SERVICE_DISCOVERY_FAILED = 602; + const int SERVICE_FOUND = 603; + const int SERVICE_LOST = 604; + const int SERVICE_REGISTRATION_FAILED = 605; + const int SERVICE_REGISTERED = 606; + const int SERVICE_RESOLUTION_FAILED = 607; + const int SERVICE_RESOLVED = 608; + const int SERVICE_GET_ADDR_FAILED = 611; + const int SERVICE_GET_ADDR_SUCCESS = 612; +} diff --git a/staticlibs/netd/aidl_api/mdns_aidl_interface/2/android/net/mdns/aidl/RegistrationInfo.aidl b/staticlibs/netd/aidl_api/mdns_aidl_interface/2/android/net/mdns/aidl/RegistrationInfo.aidl new file mode 100644 index 0000000000..185111b440 --- /dev/null +++ b/staticlibs/netd/aidl_api/mdns_aidl_interface/2/android/net/mdns/aidl/RegistrationInfo.aidl @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2022 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 -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 android.net.mdns.aidl; +/* @hide */ +@JavaDerive(equals=true, toString=true) @JavaOnlyImmutable +parcelable RegistrationInfo { + int id; + int result; + @utf8InCpp String serviceName; + @utf8InCpp String registrationType; + int port; + byte[] txtRecord; + int interfaceIdx; +} diff --git a/staticlibs/netd/aidl_api/mdns_aidl_interface/2/android/net/mdns/aidl/ResolutionInfo.aidl b/staticlibs/netd/aidl_api/mdns_aidl_interface/2/android/net/mdns/aidl/ResolutionInfo.aidl new file mode 100644 index 0000000000..4aa7d79114 --- /dev/null +++ b/staticlibs/netd/aidl_api/mdns_aidl_interface/2/android/net/mdns/aidl/ResolutionInfo.aidl @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2022 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 -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 android.net.mdns.aidl; +/* @hide */ +@JavaDerive(equals=true, toString=true) @JavaOnlyImmutable +parcelable ResolutionInfo { + int id; + int result; + @utf8InCpp String serviceName; + @utf8InCpp String registrationType; + @utf8InCpp String domain; + @utf8InCpp String serviceFullName; + @utf8InCpp String hostname; + int port; + byte[] txtRecord; + int interfaceIdx; +} diff --git a/staticlibs/netd/aidl_api/mdns_aidl_interface/current/android/net/mdns/aidl/IMDns.aidl b/staticlibs/netd/aidl_api/mdns_aidl_interface/current/android/net/mdns/aidl/IMDns.aidl index ecbe966dea..d84742bcd2 100644 --- a/staticlibs/netd/aidl_api/mdns_aidl_interface/current/android/net/mdns/aidl/IMDns.aidl +++ b/staticlibs/netd/aidl_api/mdns_aidl_interface/current/android/net/mdns/aidl/IMDns.aidl @@ -34,13 +34,40 @@ package android.net.mdns.aidl; /* @hide */ interface IMDns { + /** + * @deprecated unimplemented on V+. + */ void startDaemon(); + /** + * @deprecated unimplemented on V+. + */ void stopDaemon(); + /** + * @deprecated unimplemented on U+. + */ void registerService(in android.net.mdns.aidl.RegistrationInfo info); + /** + * @deprecated unimplemented on U+. + */ void discover(in android.net.mdns.aidl.DiscoveryInfo info); + /** + * @deprecated unimplemented on U+. + */ void resolve(in android.net.mdns.aidl.ResolutionInfo info); + /** + * @deprecated unimplemented on U+. + */ void getServiceAddress(in android.net.mdns.aidl.GetAddressInfo info); + /** + * @deprecated unimplemented on U+. + */ void stopOperation(int id); + /** + * @deprecated unimplemented on U+. + */ void registerEventListener(in android.net.mdns.aidl.IMDnsEventListener listener); + /** + * @deprecated unimplemented on U+. + */ void unregisterEventListener(in android.net.mdns.aidl.IMDnsEventListener listener); } diff --git a/staticlibs/netd/aidl_api/mdns_aidl_interface/current/android/net/mdns/aidl/IMDnsEventListener.aidl b/staticlibs/netd/aidl_api/mdns_aidl_interface/current/android/net/mdns/aidl/IMDnsEventListener.aidl index 4625cac7ab..187a3d26dd 100644 --- a/staticlibs/netd/aidl_api/mdns_aidl_interface/current/android/net/mdns/aidl/IMDnsEventListener.aidl +++ b/staticlibs/netd/aidl_api/mdns_aidl_interface/current/android/net/mdns/aidl/IMDnsEventListener.aidl @@ -34,9 +34,21 @@ package android.net.mdns.aidl; /* @hide */ interface IMDnsEventListener { + /** + * @deprecated this is implemented for backward compatibility. Don't use it in new code. + */ oneway void onServiceRegistrationStatus(in android.net.mdns.aidl.RegistrationInfo status); + /** + * @deprecated this is implemented for backward compatibility. Don't use it in new code. + */ oneway void onServiceDiscoveryStatus(in android.net.mdns.aidl.DiscoveryInfo status); + /** + * @deprecated this is implemented for backward compatibility. Don't use it in new code. + */ oneway void onServiceResolutionStatus(in android.net.mdns.aidl.ResolutionInfo status); + /** + * @deprecated this is implemented for backward compatibility. Don't use it in new code. + */ oneway void onGettingServiceAddressStatus(in android.net.mdns.aidl.GetAddressInfo status); const int SERVICE_DISCOVERY_FAILED = 602; const int SERVICE_FOUND = 603; diff --git a/staticlibs/netd/binder/android/net/mdns/aidl/IMDns.aidl b/staticlibs/netd/binder/android/net/mdns/aidl/IMDns.aidl index 255d70ffea..3bf1da8201 100644 --- a/staticlibs/netd/binder/android/net/mdns/aidl/IMDns.aidl +++ b/staticlibs/netd/binder/android/net/mdns/aidl/IMDns.aidl @@ -28,6 +28,8 @@ interface IMDns { * Start the MDNSResponder daemon. * * @throws ServiceSpecificException with unix errno EALREADY if daemon is already running. + * @throws UnsupportedOperationException on Android V and after. + * @deprecated unimplemented on V+. */ void startDaemon(); @@ -35,6 +37,8 @@ interface IMDns { * Stop the MDNSResponder daemon. * * @throws ServiceSpecificException with unix errno EBUSY if daemon is still in use. + * @throws UnsupportedOperationException on Android V and after. + * @deprecated unimplemented on V+. */ void stopDaemon(); @@ -49,6 +53,8 @@ interface IMDns { * @throws ServiceSpecificException with one of the following error values: * - Unix errno EBUSY if request id is already in use. * - kDNSServiceErr_* list in dns_sd.h if registration fail. + * @throws UnsupportedOperationException on Android U and after. + * @deprecated unimplemented on U+. */ void registerService(in RegistrationInfo info); @@ -63,6 +69,8 @@ interface IMDns { * @throws ServiceSpecificException with one of the following error values: * - Unix errno EBUSY if request id is already in use. * - kDNSServiceErr_* list in dns_sd.h if discovery fail. + * @throws UnsupportedOperationException on Android U and after. + * @deprecated unimplemented on U+. */ void discover(in DiscoveryInfo info); @@ -77,6 +85,8 @@ interface IMDns { * @throws ServiceSpecificException with one of the following error values: * - Unix errno EBUSY if request id is already in use. * - kDNSServiceErr_* list in dns_sd.h if resolution fail. + * @throws UnsupportedOperationException on Android U and after. + * @deprecated unimplemented on U+. */ void resolve(in ResolutionInfo info); @@ -92,6 +102,8 @@ interface IMDns { * @throws ServiceSpecificException with one of the following error values: * - Unix errno EBUSY if request id is already in use. * - kDNSServiceErr_* list in dns_sd.h if getting address fail. + * @throws UnsupportedOperationException on Android U and after. + * @deprecated unimplemented on U+. */ void getServiceAddress(in GetAddressInfo info); @@ -101,6 +113,8 @@ interface IMDns { * @param id the operation id to be stopped. * * @throws ServiceSpecificException with unix errno ESRCH if request id is not in use. + * @throws UnsupportedOperationException on Android U and after. + * @deprecated unimplemented on U+. */ void stopOperation(int id); @@ -112,6 +126,8 @@ interface IMDns { * @throws ServiceSpecificException with one of the following error values: * - Unix errno EINVAL if listener is null. * - Unix errno EEXIST if register duplicated listener. + * @throws UnsupportedOperationException on Android U and after. + * @deprecated unimplemented on U+. */ void registerEventListener(in IMDnsEventListener listener); @@ -121,6 +137,8 @@ interface IMDns { * @param listener The listener to be unregistered. * * @throws ServiceSpecificException with unix errno EINVAL if listener is null. + * @throws UnsupportedOperationException on Android U and after. + * @deprecated unimplemented on U+. */ void unregisterEventListener(in IMDnsEventListener listener); } diff --git a/staticlibs/netd/binder/android/net/mdns/aidl/IMDnsEventListener.aidl b/staticlibs/netd/binder/android/net/mdns/aidl/IMDnsEventListener.aidl index a202a261a3..f7f028bcb6 100644 --- a/staticlibs/netd/binder/android/net/mdns/aidl/IMDnsEventListener.aidl +++ b/staticlibs/netd/binder/android/net/mdns/aidl/IMDnsEventListener.aidl @@ -31,8 +31,8 @@ import android.net.mdns.aidl.ResolutionInfo; oneway interface IMDnsEventListener { /** * Types for MDNS operation result. - * These are in sync with frameworks/libs/net/common/netd/libnetdutils/include/netdutils/\ - * ResponseCode.h + * These are in sync with packages/modules/Connectivity/staticlibs/netd/libnetdutils/include/\ + * netdutils/ResponseCode.h */ const int SERVICE_DISCOVERY_FAILED = 602; const int SERVICE_FOUND = 603; @@ -46,21 +46,29 @@ oneway interface IMDnsEventListener { /** * Notify service registration status. + * + * @deprecated this is implemented for backward compatibility. Don't use it in new code. */ void onServiceRegistrationStatus(in RegistrationInfo status); /** * Notify service discovery status. + * + * @deprecated this is implemented for backward compatibility. Don't use it in new code. */ void onServiceDiscoveryStatus(in DiscoveryInfo status); /** * Notify service resolution status. + * + * @deprecated this is implemented for backward compatibility. Don't use it in new code. */ void onServiceResolutionStatus(in ResolutionInfo status); /** * Notify getting service address status. + * + * @deprecated this is implemented for backward compatibility. Don't use it in new code. */ void onGettingServiceAddressStatus(in GetAddressInfo status); }