From 1232fe37be941548681cdce3e36bffd94d8549b0 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Fri, 5 Apr 2019 15:15:48 +0900 Subject: [PATCH] Freeze the networkstack-aidl-interfaces interface This freezes the interface as of the latest beta build, not the tip of tree. IIpClient#setL2KeyAndGroupHint is not in the frozen definition in particular. Generated with: m networkstack-aidl-interfaces-freeze-api \ ipmemorystore-aidl-interfaces-freeze-api Test: flashed, booted, WiFi and captive portal working Bug: 128803828 Change-Id: Ideabe73fc93bbefca2d624ee9ca190cf31419424 --- .../src/android/net/dhcp/DhcpServer.java | 5 ++++ .../src/android/net/ip/IpClient.java | 5 ++++ .../android/server/NetworkStackService.java | 10 ++++++++ .../ipmemorystore/IpMemoryStoreService.java | 5 ++++ .../RegularMaintenanceJobService.java | 5 ++++ .../src/android/net/dhcp/DhcpServerTest.java | 5 ++++ .../IpMemoryStoreServiceTest.java | 25 +++++++++++++++++++ .../android/server/ConnectivityService.java | 5 ++++ services/net/Android.bp | 16 ++++++------ .../1/android/net/IIpMemoryStore.aidl | 9 +++++++ .../android/net/IIpMemoryStoreCallbacks.aidl | 4 +++ .../1/android/net/ipmemorystore/Blob.aidl | 4 +++ .../IOnBlobRetrievedListener.aidl | 4 +++ .../IOnL2KeyResponseListener.aidl | 4 +++ ...IOnNetworkAttributesRetrievedListener.aidl | 4 +++ .../IOnSameL3NetworkResponseListener.aidl | 4 +++ .../net/ipmemorystore/IOnStatusListener.aidl | 4 +++ .../NetworkAttributesParcelable.aidl | 8 ++++++ .../SameL3NetworkResponseParcelable.aidl | 6 +++++ .../net/ipmemorystore/StatusParcelable.aidl | 4 +++ .../1/android/net/DhcpResultsParcelable.aidl | 8 ++++++ .../1/android/net/INetworkMonitor.aidl | 17 +++++++++++++ .../android/net/INetworkMonitorCallbacks.aidl | 8 ++++++ .../1/android/net/INetworkStackConnector.aidl | 7 ++++++ .../net/INetworkStackStatusCallback.aidl | 4 +++ .../net/InitialConfigurationParcelable.aidl | 7 ++++++ .../1/android/net/PrivateDnsConfigParcel.aidl | 5 ++++ .../ProvisioningConfigurationParcelable.aidl | 15 +++++++++++ .../net/TcpKeepalivePacketDataParcelable.aidl | 13 ++++++++++ .../net/dhcp/DhcpServingParamsParcel.aidl | 11 ++++++++ .../1/android/net/dhcp/IDhcpServer.aidl | 10 ++++++++ .../net/dhcp/IDhcpServerCallbacks.aidl | 4 +++ .../1/android/net/ip/IIpClient.aidl | 14 +++++++++++ .../1/android/net/ip/IIpClientCallbacks.aidl | 16 ++++++++++++ .../net/java/android/net/IpMemoryStore.java | 5 ++++ .../net/java/android/net/ip/IpClientUtil.java | 5 ++++ .../net/java/android/net/ip/IpServer.java | 5 ++++ .../OnBlobRetrievedListener.java | 5 ++++ .../OnL2KeyResponseListener.java | 5 ++++ .../OnNetworkAttributesRetrievedListener.java | 5 ++++ .../OnSameL3NetworkResponseListener.java | 5 ++++ .../net/ipmemorystore/OnStatusListener.java | 5 ++++ 42 files changed, 306 insertions(+), 9 deletions(-) create mode 100644 services/net/aidl/ipmemorystore/1/android/net/IIpMemoryStore.aidl create mode 100644 services/net/aidl/ipmemorystore/1/android/net/IIpMemoryStoreCallbacks.aidl create mode 100644 services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/Blob.aidl create mode 100644 services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl create mode 100644 services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl create mode 100644 services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl create mode 100644 services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl create mode 100644 services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnStatusListener.aidl create mode 100644 services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/NetworkAttributesParcelable.aidl create mode 100644 services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl create mode 100644 services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/StatusParcelable.aidl create mode 100644 services/net/aidl/networkstack/1/android/net/DhcpResultsParcelable.aidl create mode 100644 services/net/aidl/networkstack/1/android/net/INetworkMonitor.aidl create mode 100644 services/net/aidl/networkstack/1/android/net/INetworkMonitorCallbacks.aidl create mode 100644 services/net/aidl/networkstack/1/android/net/INetworkStackConnector.aidl create mode 100644 services/net/aidl/networkstack/1/android/net/INetworkStackStatusCallback.aidl create mode 100644 services/net/aidl/networkstack/1/android/net/InitialConfigurationParcelable.aidl create mode 100644 services/net/aidl/networkstack/1/android/net/PrivateDnsConfigParcel.aidl create mode 100644 services/net/aidl/networkstack/1/android/net/ProvisioningConfigurationParcelable.aidl create mode 100644 services/net/aidl/networkstack/1/android/net/TcpKeepalivePacketDataParcelable.aidl create mode 100644 services/net/aidl/networkstack/1/android/net/dhcp/DhcpServingParamsParcel.aidl create mode 100644 services/net/aidl/networkstack/1/android/net/dhcp/IDhcpServer.aidl create mode 100644 services/net/aidl/networkstack/1/android/net/dhcp/IDhcpServerCallbacks.aidl create mode 100644 services/net/aidl/networkstack/1/android/net/ip/IIpClient.aidl create mode 100644 services/net/aidl/networkstack/1/android/net/ip/IIpClientCallbacks.aidl diff --git a/packages/NetworkStack/src/android/net/dhcp/DhcpServer.java b/packages/NetworkStack/src/android/net/dhcp/DhcpServer.java index d21b5f7853bb1..b8ab94ce38308 100644 --- a/packages/NetworkStack/src/android/net/dhcp/DhcpServer.java +++ b/packages/NetworkStack/src/android/net/dhcp/DhcpServer.java @@ -647,4 +647,9 @@ public class DhcpServer extends IDhcpServer.Stub { } } } + + @Override + public int getInterfaceVersion() { + return this.VERSION; + } } diff --git a/packages/NetworkStack/src/android/net/ip/IpClient.java b/packages/NetworkStack/src/android/net/ip/IpClient.java index 80d139cb6153b..96e09fafb6b6d 100644 --- a/packages/NetworkStack/src/android/net/ip/IpClient.java +++ b/packages/NetworkStack/src/android/net/ip/IpClient.java @@ -557,6 +557,11 @@ public class IpClient extends StateMachine { checkNetworkStackCallingPermission(); IpClient.this.removeKeepalivePacketFilter(slot); } + + @Override + public int getInterfaceVersion() { + return this.VERSION; + } } public String getInterfaceName() { diff --git a/packages/NetworkStack/src/com/android/server/NetworkStackService.java b/packages/NetworkStack/src/com/android/server/NetworkStackService.java index a0a90fde518f0..a6d74842f6310 100644 --- a/packages/NetworkStack/src/com/android/server/NetworkStackService.java +++ b/packages/NetworkStack/src/com/android/server/NetworkStackService.java @@ -251,6 +251,11 @@ public class NetworkStackService extends Service { } } } + + @Override + public int getInterfaceVersion() { + return this.VERSION; + } } private static class NetworkMonitorImpl extends INetworkMonitor.Stub { @@ -325,5 +330,10 @@ public class NetworkStackService extends Service { checkNetworkStackCallingPermission(); mNm.notifyNetworkCapabilitiesChanged(nc); } + + @Override + public int getInterfaceVersion() { + return this.VERSION; + } } } diff --git a/packages/NetworkStack/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreService.java b/packages/NetworkStack/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreService.java index bee4bbd9f42d1..6a6bf83bd3c84 100644 --- a/packages/NetworkStack/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreService.java +++ b/packages/NetworkStack/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreService.java @@ -494,4 +494,9 @@ public class IpMemoryStoreService extends IIpMemoryStore.Stub { listener.onComplete(makeStatus(ERROR_INTERNAL_INTERRUPTED)); return true; } + + @Override + public int getInterfaceVersion() { + return this.VERSION; + } } diff --git a/packages/NetworkStack/src/com/android/server/connectivity/ipmemorystore/RegularMaintenanceJobService.java b/packages/NetworkStack/src/com/android/server/connectivity/ipmemorystore/RegularMaintenanceJobService.java index 2775fde4c8b92..bea7052d8af26 100644 --- a/packages/NetworkStack/src/com/android/server/connectivity/ipmemorystore/RegularMaintenanceJobService.java +++ b/packages/NetworkStack/src/com/android/server/connectivity/ipmemorystore/RegularMaintenanceJobService.java @@ -90,6 +90,11 @@ public final class RegularMaintenanceJobService extends JobService { jobFinished(params, !result.isSuccess()); } + @Override + public int getInterfaceVersion() { + return this.VERSION; + } + @Override public IBinder asBinder() { return null; diff --git a/packages/NetworkStack/tests/src/android/net/dhcp/DhcpServerTest.java b/packages/NetworkStack/tests/src/android/net/dhcp/DhcpServerTest.java index 7d5e9e3ba1747..f0e2f1b8d4591 100644 --- a/packages/NetworkStack/tests/src/android/net/dhcp/DhcpServerTest.java +++ b/packages/NetworkStack/tests/src/android/net/dhcp/DhcpServerTest.java @@ -133,6 +133,11 @@ public class DhcpServerTest { public void onStatusAvailable(int statusCode) { assertEquals(STATUS_SUCCESS, statusCode); } + + @Override + public int getInterfaceVersion() { + return this.VERSION; + } }; @Before diff --git a/packages/NetworkStack/tests/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreServiceTest.java b/packages/NetworkStack/tests/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreServiceTest.java index a00eff7992d4a..87346e5d6a289 100644 --- a/packages/NetworkStack/tests/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreServiceTest.java +++ b/packages/NetworkStack/tests/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreServiceTest.java @@ -136,6 +136,11 @@ public class IpMemoryStoreServiceTest { public IBinder asBinder() { return null; } + + @Override + public int getInterfaceVersion() { + return this.VERSION; + } }; } @@ -156,6 +161,11 @@ public class IpMemoryStoreServiceTest { public IBinder asBinder() { return null; } + + @Override + public int getInterfaceVersion() { + return this.VERSION; + } }; } @@ -178,6 +188,11 @@ public class IpMemoryStoreServiceTest { public IBinder asBinder() { return null; } + + @Override + public int getInterfaceVersion() { + return this.VERSION; + } }; } @@ -200,6 +215,11 @@ public class IpMemoryStoreServiceTest { public IBinder asBinder() { return null; } + + @Override + public int getInterfaceVersion() { + return this.VERSION; + } }; } @@ -219,6 +239,11 @@ public class IpMemoryStoreServiceTest { public IBinder asBinder() { return null; } + + @Override + public int getInterfaceVersion() { + return this.VERSION; + } }; } diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index ed6ca99d92a5c..0d48de5f76d73 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -2817,6 +2817,11 @@ public class ConnectivityService extends IConnectivityManager.Stub EVENT_PROVISIONING_NOTIFICATION, PROVISIONING_NOTIFICATION_HIDE, mNai.network.netId)); } + + @Override + public int getInterfaceVersion() { + return this.VERSION; + } } private boolean networkRequiresValidation(NetworkAgentInfo nai) { diff --git a/services/net/Android.bp b/services/net/Android.bp index f73a285c1a949..d72f1cf8382bc 100644 --- a/services/net/Android.bp +++ b/services/net/Android.bp @@ -3,8 +3,6 @@ aidl_interface { name: "ipmemorystore-aidl-interfaces", local_include_dir: "java", srcs: [ - // TODO: Define and use a filegroup for these files, since they're also used in - // networkstack-aidl-interfaces. This does not appear to work at the moment. "java/android/net/IIpMemoryStore.aidl", "java/android/net/IIpMemoryStoreCallbacks.aidl", "java/android/net/ipmemorystore/**/*.aidl", @@ -17,17 +15,16 @@ aidl_interface { enabled: false, }, }, - api_dir: "aidl/networkstack", + api_dir: "aidl/ipmemorystore", + versions: ["1"], } aidl_interface { name: "networkstack-aidl-interfaces", local_include_dir: "java", - include_dirs: ["frameworks/base/core/java"], // For framework parcelables. + include_dirs: ["frameworks/base/core/java"], // For framework parcelables. srcs: [ "java/android/net/DhcpResultsParcelable.aidl", - "java/android/net/IIpMemoryStore.aidl", - "java/android/net/IIpMemoryStoreCallbacks.aidl", "java/android/net/INetworkMonitor.aidl", "java/android/net/INetworkMonitorCallbacks.aidl", "java/android/net/INetworkStackConnector.aidl", @@ -41,7 +38,6 @@ aidl_interface { "java/android/net/dhcp/IDhcpServerCallbacks.aidl", "java/android/net/ip/IIpClient.aidl", "java/android/net/ip/IIpClientCallbacks.aidl", - "java/android/net/ipmemorystore/**/*.aidl", ], backend: { ndk: { @@ -52,6 +48,8 @@ aidl_interface { }, }, api_dir: "aidl/networkstack", + imports: ["ipmemorystore-aidl-interfaces"], + versions: ["1"], } java_library_static { @@ -62,7 +60,7 @@ java_library_static { "ipmemorystore-client", "netd_aidl_interface-java", "networkstack-aidl-interfaces-java", - ] + ], } java_library_static { @@ -75,7 +73,7 @@ java_library_static { ], static_libs: [ "ipmemorystore-aidl-interfaces-java", - ] + ], } filegroup { diff --git a/services/net/aidl/ipmemorystore/1/android/net/IIpMemoryStore.aidl b/services/net/aidl/ipmemorystore/1/android/net/IIpMemoryStore.aidl new file mode 100644 index 0000000000000..a8cbab26190fa --- /dev/null +++ b/services/net/aidl/ipmemorystore/1/android/net/IIpMemoryStore.aidl @@ -0,0 +1,9 @@ +package android.net; +interface IIpMemoryStore { + oneway void storeNetworkAttributes(String l2Key, in android.net.ipmemorystore.NetworkAttributesParcelable attributes, android.net.ipmemorystore.IOnStatusListener listener); + oneway void storeBlob(String l2Key, String clientId, String name, in android.net.ipmemorystore.Blob data, android.net.ipmemorystore.IOnStatusListener listener); + oneway void findL2Key(in android.net.ipmemorystore.NetworkAttributesParcelable attributes, android.net.ipmemorystore.IOnL2KeyResponseListener listener); + oneway void isSameNetwork(String l2Key1, String l2Key2, android.net.ipmemorystore.IOnSameL3NetworkResponseListener listener); + oneway void retrieveNetworkAttributes(String l2Key, android.net.ipmemorystore.IOnNetworkAttributesRetrievedListener listener); + oneway void retrieveBlob(String l2Key, String clientId, String name, android.net.ipmemorystore.IOnBlobRetrievedListener listener); +} diff --git a/services/net/aidl/ipmemorystore/1/android/net/IIpMemoryStoreCallbacks.aidl b/services/net/aidl/ipmemorystore/1/android/net/IIpMemoryStoreCallbacks.aidl new file mode 100644 index 0000000000000..cf02c26c2fe3f --- /dev/null +++ b/services/net/aidl/ipmemorystore/1/android/net/IIpMemoryStoreCallbacks.aidl @@ -0,0 +1,4 @@ +package android.net; +interface IIpMemoryStoreCallbacks { + oneway void onIpMemoryStoreFetched(in android.net.IIpMemoryStore ipMemoryStore); +} diff --git a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/Blob.aidl b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/Blob.aidl new file mode 100644 index 0000000000000..291dbef817e69 --- /dev/null +++ b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/Blob.aidl @@ -0,0 +1,4 @@ +package android.net.ipmemorystore; +parcelable Blob { + byte[] data; +} diff --git a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl new file mode 100644 index 0000000000000..52f40d49abd50 --- /dev/null +++ b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl @@ -0,0 +1,4 @@ +package android.net.ipmemorystore; +interface IOnBlobRetrievedListener { + oneway void onBlobRetrieved(in android.net.ipmemorystore.StatusParcelable status, in String l2Key, in String name, in android.net.ipmemorystore.Blob data); +} diff --git a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl new file mode 100644 index 0000000000000..785351435d734 --- /dev/null +++ b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl @@ -0,0 +1,4 @@ +package android.net.ipmemorystore; +interface IOnL2KeyResponseListener { + oneway void onL2KeyResponse(in android.net.ipmemorystore.StatusParcelable status, in String l2Key); +} diff --git a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl new file mode 100644 index 0000000000000..3dd2ae6e9babd --- /dev/null +++ b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl @@ -0,0 +1,4 @@ +package android.net.ipmemorystore; +interface IOnNetworkAttributesRetrievedListener { + oneway void onNetworkAttributesRetrieved(in android.net.ipmemorystore.StatusParcelable status, in String l2Key, in android.net.ipmemorystore.NetworkAttributesParcelable attributes); +} diff --git a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl new file mode 100644 index 0000000000000..46d4ecb9ed7c2 --- /dev/null +++ b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl @@ -0,0 +1,4 @@ +package android.net.ipmemorystore; +interface IOnSameL3NetworkResponseListener { + oneway void onSameL3NetworkResponse(in android.net.ipmemorystore.StatusParcelable status, in android.net.ipmemorystore.SameL3NetworkResponseParcelable response); +} diff --git a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnStatusListener.aidl b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnStatusListener.aidl new file mode 100644 index 0000000000000..54e654b80c9e9 --- /dev/null +++ b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnStatusListener.aidl @@ -0,0 +1,4 @@ +package android.net.ipmemorystore; +interface IOnStatusListener { + oneway void onComplete(in android.net.ipmemorystore.StatusParcelable status); +} diff --git a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/NetworkAttributesParcelable.aidl b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/NetworkAttributesParcelable.aidl new file mode 100644 index 0000000000000..9531ea3963fb9 --- /dev/null +++ b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/NetworkAttributesParcelable.aidl @@ -0,0 +1,8 @@ +package android.net.ipmemorystore; +parcelable NetworkAttributesParcelable { + byte[] assignedV4Address; + long assignedV4AddressExpiry; + String groupHint; + android.net.ipmemorystore.Blob[] dnsAddresses; + int mtu; +} diff --git a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl new file mode 100644 index 0000000000000..414272b49f1d8 --- /dev/null +++ b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl @@ -0,0 +1,6 @@ +package android.net.ipmemorystore; +parcelable SameL3NetworkResponseParcelable { + String l2Key1; + String l2Key2; + float confidence; +} diff --git a/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/StatusParcelable.aidl b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/StatusParcelable.aidl new file mode 100644 index 0000000000000..92c6779b5dc00 --- /dev/null +++ b/services/net/aidl/ipmemorystore/1/android/net/ipmemorystore/StatusParcelable.aidl @@ -0,0 +1,4 @@ +package android.net.ipmemorystore; +parcelable StatusParcelable { + int resultCode; +} diff --git a/services/net/aidl/networkstack/1/android/net/DhcpResultsParcelable.aidl b/services/net/aidl/networkstack/1/android/net/DhcpResultsParcelable.aidl new file mode 100644 index 0000000000000..92b5345ee221d --- /dev/null +++ b/services/net/aidl/networkstack/1/android/net/DhcpResultsParcelable.aidl @@ -0,0 +1,8 @@ +package android.net; +parcelable DhcpResultsParcelable { + android.net.StaticIpConfiguration baseConfiguration; + int leaseDuration; + int mtu; + String serverAddress; + String vendorInfo; +} diff --git a/services/net/aidl/networkstack/1/android/net/INetworkMonitor.aidl b/services/net/aidl/networkstack/1/android/net/INetworkMonitor.aidl new file mode 100644 index 0000000000000..b19f522880ecb --- /dev/null +++ b/services/net/aidl/networkstack/1/android/net/INetworkMonitor.aidl @@ -0,0 +1,17 @@ +package android.net; +interface INetworkMonitor { + oneway void start(); + oneway void launchCaptivePortalApp(); + oneway void notifyCaptivePortalAppFinished(int response); + oneway void setAcceptPartialConnectivity(); + oneway void forceReevaluation(int uid); + oneway void notifyPrivateDnsChanged(in android.net.PrivateDnsConfigParcel config); + oneway void notifyDnsResponse(int returnCode); + oneway void notifyNetworkConnected(in android.net.LinkProperties lp, in android.net.NetworkCapabilities nc); + oneway void notifyNetworkDisconnected(); + oneway void notifyLinkPropertiesChanged(in android.net.LinkProperties lp); + oneway void notifyNetworkCapabilitiesChanged(in android.net.NetworkCapabilities nc); + const int NETWORK_TEST_RESULT_VALID = 0; + const int NETWORK_TEST_RESULT_INVALID = 1; + const int NETWORK_TEST_RESULT_PARTIAL_CONNECTIVITY = 2; +} diff --git a/services/net/aidl/networkstack/1/android/net/INetworkMonitorCallbacks.aidl b/services/net/aidl/networkstack/1/android/net/INetworkMonitorCallbacks.aidl new file mode 100644 index 0000000000000..ee9871ddcd15e --- /dev/null +++ b/services/net/aidl/networkstack/1/android/net/INetworkMonitorCallbacks.aidl @@ -0,0 +1,8 @@ +package android.net; +interface INetworkMonitorCallbacks { + oneway void onNetworkMonitorCreated(in android.net.INetworkMonitor networkMonitor); + oneway void notifyNetworkTested(int testResult, @nullable String redirectUrl); + oneway void notifyPrivateDnsConfigResolved(in android.net.PrivateDnsConfigParcel config); + oneway void showProvisioningNotification(String action, String packageName); + oneway void hideProvisioningNotification(); +} diff --git a/services/net/aidl/networkstack/1/android/net/INetworkStackConnector.aidl b/services/net/aidl/networkstack/1/android/net/INetworkStackConnector.aidl new file mode 100644 index 0000000000000..7da11e476c0e4 --- /dev/null +++ b/services/net/aidl/networkstack/1/android/net/INetworkStackConnector.aidl @@ -0,0 +1,7 @@ +package android.net; +interface INetworkStackConnector { + oneway void makeDhcpServer(in String ifName, in android.net.dhcp.DhcpServingParamsParcel params, in android.net.dhcp.IDhcpServerCallbacks cb); + oneway void makeNetworkMonitor(in android.net.Network network, String name, in android.net.INetworkMonitorCallbacks cb); + oneway void makeIpClient(in String ifName, in android.net.ip.IIpClientCallbacks callbacks); + oneway void fetchIpMemoryStore(in android.net.IIpMemoryStoreCallbacks cb); +} diff --git a/services/net/aidl/networkstack/1/android/net/INetworkStackStatusCallback.aidl b/services/net/aidl/networkstack/1/android/net/INetworkStackStatusCallback.aidl new file mode 100644 index 0000000000000..f6ca6f7a78e20 --- /dev/null +++ b/services/net/aidl/networkstack/1/android/net/INetworkStackStatusCallback.aidl @@ -0,0 +1,4 @@ +package android.net; +interface INetworkStackStatusCallback { + oneway void onStatusAvailable(int statusCode); +} diff --git a/services/net/aidl/networkstack/1/android/net/InitialConfigurationParcelable.aidl b/services/net/aidl/networkstack/1/android/net/InitialConfigurationParcelable.aidl new file mode 100644 index 0000000000000..c80a78785b3b1 --- /dev/null +++ b/services/net/aidl/networkstack/1/android/net/InitialConfigurationParcelable.aidl @@ -0,0 +1,7 @@ +package android.net; +parcelable InitialConfigurationParcelable { + android.net.LinkAddress[] ipAddresses; + android.net.IpPrefix[] directlyConnectedRoutes; + String[] dnsServers; + String gateway; +} diff --git a/services/net/aidl/networkstack/1/android/net/PrivateDnsConfigParcel.aidl b/services/net/aidl/networkstack/1/android/net/PrivateDnsConfigParcel.aidl new file mode 100644 index 0000000000000..2de790bb77544 --- /dev/null +++ b/services/net/aidl/networkstack/1/android/net/PrivateDnsConfigParcel.aidl @@ -0,0 +1,5 @@ +package android.net; +parcelable PrivateDnsConfigParcel { + String hostname; + String[] ips; +} diff --git a/services/net/aidl/networkstack/1/android/net/ProvisioningConfigurationParcelable.aidl b/services/net/aidl/networkstack/1/android/net/ProvisioningConfigurationParcelable.aidl new file mode 100644 index 0000000000000..3a6c30496fd82 --- /dev/null +++ b/services/net/aidl/networkstack/1/android/net/ProvisioningConfigurationParcelable.aidl @@ -0,0 +1,15 @@ +package android.net; +parcelable ProvisioningConfigurationParcelable { + boolean enableIPv4; + boolean enableIPv6; + boolean usingMultinetworkPolicyTracker; + boolean usingIpReachabilityMonitor; + int requestedPreDhcpActionMs; + android.net.InitialConfigurationParcelable initialConfig; + android.net.StaticIpConfiguration staticIpConfig; + android.net.apf.ApfCapabilities apfCapabilities; + int provisioningTimeoutMs; + int ipv6AddrGenMode; + android.net.Network network; + String displayName; +} diff --git a/services/net/aidl/networkstack/1/android/net/TcpKeepalivePacketDataParcelable.aidl b/services/net/aidl/networkstack/1/android/net/TcpKeepalivePacketDataParcelable.aidl new file mode 100644 index 0000000000000..e121c064f7aca --- /dev/null +++ b/services/net/aidl/networkstack/1/android/net/TcpKeepalivePacketDataParcelable.aidl @@ -0,0 +1,13 @@ +package android.net; +parcelable TcpKeepalivePacketDataParcelable { + byte[] srcAddress; + int srcPort; + byte[] dstAddress; + int dstPort; + int seq; + int ack; + int rcvWnd; + int rcvWndScale; + int tos; + int ttl; +} diff --git a/services/net/aidl/networkstack/1/android/net/dhcp/DhcpServingParamsParcel.aidl b/services/net/aidl/networkstack/1/android/net/dhcp/DhcpServingParamsParcel.aidl new file mode 100644 index 0000000000000..67193ae904bcf --- /dev/null +++ b/services/net/aidl/networkstack/1/android/net/dhcp/DhcpServingParamsParcel.aidl @@ -0,0 +1,11 @@ +package android.net.dhcp; +parcelable DhcpServingParamsParcel { + int serverAddr; + int serverAddrPrefixLength; + int[] defaultRouters; + int[] dnsServers; + int[] excludedAddrs; + long dhcpLeaseTimeSecs; + int linkMtu; + boolean metered; +} diff --git a/services/net/aidl/networkstack/1/android/net/dhcp/IDhcpServer.aidl b/services/net/aidl/networkstack/1/android/net/dhcp/IDhcpServer.aidl new file mode 100644 index 0000000000000..9143158554964 --- /dev/null +++ b/services/net/aidl/networkstack/1/android/net/dhcp/IDhcpServer.aidl @@ -0,0 +1,10 @@ +package android.net.dhcp; +interface IDhcpServer { + oneway void start(in android.net.INetworkStackStatusCallback cb); + oneway void updateParams(in android.net.dhcp.DhcpServingParamsParcel params, in android.net.INetworkStackStatusCallback cb); + oneway void stop(in android.net.INetworkStackStatusCallback cb); + const int STATUS_UNKNOWN = 0; + const int STATUS_SUCCESS = 1; + const int STATUS_INVALID_ARGUMENT = 2; + const int STATUS_UNKNOWN_ERROR = 3; +} diff --git a/services/net/aidl/networkstack/1/android/net/dhcp/IDhcpServerCallbacks.aidl b/services/net/aidl/networkstack/1/android/net/dhcp/IDhcpServerCallbacks.aidl new file mode 100644 index 0000000000000..dcc4489d52a64 --- /dev/null +++ b/services/net/aidl/networkstack/1/android/net/dhcp/IDhcpServerCallbacks.aidl @@ -0,0 +1,4 @@ +package android.net.dhcp; +interface IDhcpServerCallbacks { + oneway void onDhcpServerCreated(int statusCode, in android.net.dhcp.IDhcpServer server); +} diff --git a/services/net/aidl/networkstack/1/android/net/ip/IIpClient.aidl b/services/net/aidl/networkstack/1/android/net/ip/IIpClient.aidl new file mode 100644 index 0000000000000..95a15742a6846 --- /dev/null +++ b/services/net/aidl/networkstack/1/android/net/ip/IIpClient.aidl @@ -0,0 +1,14 @@ +package android.net.ip; +interface IIpClient { + oneway void completedPreDhcpAction(); + oneway void confirmConfiguration(); + oneway void readPacketFilterComplete(in byte[] data); + oneway void shutdown(); + oneway void startProvisioning(in android.net.ProvisioningConfigurationParcelable req); + oneway void stop(); + oneway void setTcpBufferSizes(in String tcpBufferSizes); + oneway void setHttpProxy(in android.net.ProxyInfo proxyInfo); + oneway void setMulticastFilter(boolean enabled); + oneway void addKeepalivePacketFilter(int slot, in android.net.TcpKeepalivePacketDataParcelable pkt); + oneway void removeKeepalivePacketFilter(int slot); +} diff --git a/services/net/aidl/networkstack/1/android/net/ip/IIpClientCallbacks.aidl b/services/net/aidl/networkstack/1/android/net/ip/IIpClientCallbacks.aidl new file mode 100644 index 0000000000000..d6bc8089a0bef --- /dev/null +++ b/services/net/aidl/networkstack/1/android/net/ip/IIpClientCallbacks.aidl @@ -0,0 +1,16 @@ +package android.net.ip; +interface IIpClientCallbacks { + oneway void onIpClientCreated(in android.net.ip.IIpClient ipClient); + oneway void onPreDhcpAction(); + oneway void onPostDhcpAction(); + oneway void onNewDhcpResults(in android.net.DhcpResultsParcelable dhcpResults); + oneway void onProvisioningSuccess(in android.net.LinkProperties newLp); + oneway void onProvisioningFailure(in android.net.LinkProperties newLp); + oneway void onLinkPropertiesChange(in android.net.LinkProperties newLp); + oneway void onReachabilityLost(in String logMsg); + oneway void onQuit(); + oneway void installPacketFilter(in byte[] filter); + oneway void startReadPacketFilter(); + oneway void setFallbackMulticastFilter(boolean enabled); + oneway void setNeighborDiscoveryOffload(boolean enable); +} diff --git a/services/net/java/android/net/IpMemoryStore.java b/services/net/java/android/net/IpMemoryStore.java index 9248299e178d5..4a115e6ec55b1 100644 --- a/services/net/java/android/net/IpMemoryStore.java +++ b/services/net/java/android/net/IpMemoryStore.java @@ -41,6 +41,11 @@ public class IpMemoryStore extends IpMemoryStoreClient { public void onIpMemoryStoreFetched(final IIpMemoryStore memoryStore) { mService.complete(memoryStore); } + + @Override + public int getInterfaceVersion() { + return this.VERSION; + } }); } diff --git a/services/net/java/android/net/ip/IpClientUtil.java b/services/net/java/android/net/ip/IpClientUtil.java index 90624e0518f88..714ade12435b9 100644 --- a/services/net/java/android/net/ip/IpClientUtil.java +++ b/services/net/java/android/net/ip/IpClientUtil.java @@ -175,6 +175,11 @@ public class IpClientUtil { public void setNeighborDiscoveryOffload(boolean enable) { mCb.setNeighborDiscoveryOffload(enable); } + + @Override + public int getInterfaceVersion() { + return this.VERSION; + } } /** diff --git a/services/net/java/android/net/ip/IpServer.java b/services/net/java/android/net/ip/IpServer.java index fc1128b804992..66884c60b0bc7 100644 --- a/services/net/java/android/net/ip/IpServer.java +++ b/services/net/java/android/net/ip/IpServer.java @@ -277,6 +277,11 @@ public class IpServer extends StateMachine { } public abstract void callback(int statusCode); + + @Override + public int getInterfaceVersion() { + return this.VERSION; + } } private class DhcpServerCallbacksImpl extends DhcpServerCallbacks { diff --git a/services/net/java/android/net/ipmemorystore/OnBlobRetrievedListener.java b/services/net/java/android/net/ipmemorystore/OnBlobRetrievedListener.java index 22978a262a11b..a17483a84e78f 100644 --- a/services/net/java/android/net/ipmemorystore/OnBlobRetrievedListener.java +++ b/services/net/java/android/net/ipmemorystore/OnBlobRetrievedListener.java @@ -40,6 +40,11 @@ public interface OnBlobRetrievedListener { listener.onBlobRetrieved(new Status(statusParcelable), l2Key, name, blob); } } + + @Override + public int getInterfaceVersion() { + return this.VERSION; + } }; } } diff --git a/services/net/java/android/net/ipmemorystore/OnL2KeyResponseListener.java b/services/net/java/android/net/ipmemorystore/OnL2KeyResponseListener.java index 9e7c1c869e1aa..e608aecbf4986 100644 --- a/services/net/java/android/net/ipmemorystore/OnL2KeyResponseListener.java +++ b/services/net/java/android/net/ipmemorystore/OnL2KeyResponseListener.java @@ -40,6 +40,11 @@ public interface OnL2KeyResponseListener { listener.onL2KeyResponse(new Status(statusParcelable), l2Key); } } + + @Override + public int getInterfaceVersion() { + return this.VERSION; + } }; } } diff --git a/services/net/java/android/net/ipmemorystore/OnNetworkAttributesRetrievedListener.java b/services/net/java/android/net/ipmemorystore/OnNetworkAttributesRetrievedListener.java index 59da26880bdda..ca6f3029d4964 100644 --- a/services/net/java/android/net/ipmemorystore/OnNetworkAttributesRetrievedListener.java +++ b/services/net/java/android/net/ipmemorystore/OnNetworkAttributesRetrievedListener.java @@ -44,6 +44,11 @@ public interface OnNetworkAttributesRetrievedListener { new NetworkAttributes(networkAttributesParcelable)); } } + + @Override + public int getInterfaceVersion() { + return this.VERSION; + } }; } } diff --git a/services/net/java/android/net/ipmemorystore/OnSameL3NetworkResponseListener.java b/services/net/java/android/net/ipmemorystore/OnSameL3NetworkResponseListener.java index 0154fd259620d..67f8da81c3f2c 100644 --- a/services/net/java/android/net/ipmemorystore/OnSameL3NetworkResponseListener.java +++ b/services/net/java/android/net/ipmemorystore/OnSameL3NetworkResponseListener.java @@ -43,6 +43,11 @@ public interface OnSameL3NetworkResponseListener { new SameL3NetworkResponse(sameL3NetworkResponseParcelable)); } } + + @Override + public int getInterfaceVersion() { + return this.VERSION; + } }; } } diff --git a/services/net/java/android/net/ipmemorystore/OnStatusListener.java b/services/net/java/android/net/ipmemorystore/OnStatusListener.java index 824b7b05bd5d1..4262efde8843d 100644 --- a/services/net/java/android/net/ipmemorystore/OnStatusListener.java +++ b/services/net/java/android/net/ipmemorystore/OnStatusListener.java @@ -39,6 +39,11 @@ public interface OnStatusListener { listener.onComplete(new Status(statusParcelable)); } } + + @Override + public int getInterfaceVersion() { + return this.VERSION; + } }; } }