From 3a680dc8977518b359e0adea715fc0f81a81c605 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Fri, 19 Feb 2021 12:53:54 +0900 Subject: Move connectivity AIDLs to android.net java_sdk_libraries and apexes need to contain bootclasspath classes under predefined packages. Tethering currently uses android.net, so make sure all the connectivity bootclasspath classes are under android.net. This avoids maintaining two packages for the tethering APEX, where com.android.connectivity.aidl is only used by internal AIDL files. Bug: 182984842 Test: m Change-Id: I611f1941698c574e37aea912ee76dadc8b32e41a Merged-In: I611f1941698c574e37aea912ee76dadc8b32e41a --- .../src/android/net/ConnectivityManager.java | 1 - .../src/android/net/IConnectivityManager.aidl | 3 +- .../framework/src/android/net/INetworkAgent.aidl | 49 ++++++++++++++++++++++ .../src/android/net/INetworkAgentRegistry.aidl | 42 +++++++++++++++++++ .../framework/src/android/net/NetworkAgent.java | 2 - .../android/connectivity/aidl/INetworkAgent.aidl | 49 ---------------------- .../connectivity/aidl/INetworkAgentRegistry.aidl | 42 ------------------- 7 files changed, 92 insertions(+), 96 deletions(-) create mode 100644 packages/Connectivity/framework/src/android/net/INetworkAgent.aidl create mode 100644 packages/Connectivity/framework/src/android/net/INetworkAgentRegistry.aidl delete mode 100644 packages/Connectivity/framework/src/com/android/connectivity/aidl/INetworkAgent.aidl delete mode 100644 packages/Connectivity/framework/src/com/android/connectivity/aidl/INetworkAgentRegistry.aidl (limited to 'packages') diff --git a/packages/Connectivity/framework/src/android/net/ConnectivityManager.java b/packages/Connectivity/framework/src/android/net/ConnectivityManager.java index 001e3a72d226..a5e9f31a5bf7 100644 --- a/packages/Connectivity/framework/src/android/net/ConnectivityManager.java +++ b/packages/Connectivity/framework/src/android/net/ConnectivityManager.java @@ -73,7 +73,6 @@ import android.util.Log; import android.util.Range; import android.util.SparseIntArray; -import com.android.connectivity.aidl.INetworkAgent; import com.android.internal.annotations.GuardedBy; import com.android.internal.util.Preconditions; diff --git a/packages/Connectivity/framework/src/android/net/IConnectivityManager.aidl b/packages/Connectivity/framework/src/android/net/IConnectivityManager.aidl index 98f3d40c0b07..3300fa8fd12a 100644 --- a/packages/Connectivity/framework/src/android/net/IConnectivityManager.aidl +++ b/packages/Connectivity/framework/src/android/net/IConnectivityManager.aidl @@ -20,6 +20,7 @@ import android.app.PendingIntent; import android.net.ConnectionInfo; import android.net.ConnectivityDiagnosticsManager; import android.net.IConnectivityDiagnosticsCallback; +import android.net.INetworkAgent; import android.net.IOnCompleteListener; import android.net.INetworkActivityListener; import android.net.IQosCallback; @@ -45,8 +46,6 @@ import android.os.PersistableBundle; import android.os.ResultReceiver; import android.os.UserHandle; -import com.android.connectivity.aidl.INetworkAgent; - /** * Interface that answers queries about, and allows changing, the * state of network connectivity. diff --git a/packages/Connectivity/framework/src/android/net/INetworkAgent.aidl b/packages/Connectivity/framework/src/android/net/INetworkAgent.aidl new file mode 100644 index 000000000000..1f66e18717d8 --- /dev/null +++ b/packages/Connectivity/framework/src/android/net/INetworkAgent.aidl @@ -0,0 +1,49 @@ +/** + * Copyright (c) 2020, 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 perNmissions and + * limitations under the License. + */ +package android.net; + +import android.net.NattKeepalivePacketData; +import android.net.QosFilterParcelable; +import android.net.TcpKeepalivePacketData; + +import android.net.INetworkAgentRegistry; + +/** + * Interface to notify NetworkAgent of connectivity events. + * @hide + */ +oneway interface INetworkAgent { + void onRegistered(in INetworkAgentRegistry registry); + void onDisconnected(); + void onBandwidthUpdateRequested(); + void onValidationStatusChanged(int validationStatus, + in @nullable String captivePortalUrl); + void onSaveAcceptUnvalidated(boolean acceptUnvalidated); + void onStartNattSocketKeepalive(int slot, int intervalDurationMs, + in NattKeepalivePacketData packetData); + void onStartTcpSocketKeepalive(int slot, int intervalDurationMs, + in TcpKeepalivePacketData packetData); + void onStopSocketKeepalive(int slot); + void onSignalStrengthThresholdsUpdated(in int[] thresholds); + void onPreventAutomaticReconnect(); + void onAddNattKeepalivePacketFilter(int slot, + in NattKeepalivePacketData packetData); + void onAddTcpKeepalivePacketFilter(int slot, + in TcpKeepalivePacketData packetData); + void onRemoveKeepalivePacketFilter(int slot); + void onQosFilterCallbackRegistered(int qosCallbackId, in QosFilterParcelable filterParcel); + void onQosCallbackUnregistered(int qosCallbackId); +} diff --git a/packages/Connectivity/framework/src/android/net/INetworkAgentRegistry.aidl b/packages/Connectivity/framework/src/android/net/INetworkAgentRegistry.aidl new file mode 100644 index 000000000000..c5464d32412b --- /dev/null +++ b/packages/Connectivity/framework/src/android/net/INetworkAgentRegistry.aidl @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2020, 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 perNmissions and + * limitations under the License. + */ +package android.net; + +import android.net.LinkProperties; +import android.net.Network; +import android.net.NetworkCapabilities; +import android.net.NetworkInfo; +import android.net.NetworkScore; +import android.net.QosSession; +import android.telephony.data.EpsBearerQosSessionAttributes; + +/** + * Interface for NetworkAgents to send network properties. + * @hide + */ +oneway interface INetworkAgentRegistry { + void sendNetworkCapabilities(in NetworkCapabilities nc); + void sendLinkProperties(in LinkProperties lp); + // TODO: consider replacing this by "markConnected()" and removing + void sendNetworkInfo(in NetworkInfo info); + void sendScore(in NetworkScore score); + void sendExplicitlySelected(boolean explicitlySelected, boolean acceptPartial); + void sendSocketKeepaliveEvent(int slot, int reason); + void sendUnderlyingNetworks(in @nullable List networks); + void sendEpsQosSessionAvailable(int callbackId, in QosSession session, in EpsBearerQosSessionAttributes attributes); + void sendQosSessionLost(int qosCallbackId, in QosSession session); + void sendQosCallbackError(int qosCallbackId, int exceptionType); +} diff --git a/packages/Connectivity/framework/src/android/net/NetworkAgent.java b/packages/Connectivity/framework/src/android/net/NetworkAgent.java index a127c6f6de26..1416bb9775c1 100644 --- a/packages/Connectivity/framework/src/android/net/NetworkAgent.java +++ b/packages/Connectivity/framework/src/android/net/NetworkAgent.java @@ -34,8 +34,6 @@ import android.os.RemoteException; import android.telephony.data.EpsBearerQosSessionAttributes; import android.util.Log; -import com.android.connectivity.aidl.INetworkAgent; -import com.android.connectivity.aidl.INetworkAgentRegistry; import com.android.internal.annotations.VisibleForTesting; import java.lang.annotation.Retention; diff --git a/packages/Connectivity/framework/src/com/android/connectivity/aidl/INetworkAgent.aidl b/packages/Connectivity/framework/src/com/android/connectivity/aidl/INetworkAgent.aidl deleted file mode 100644 index 64b556720cd2..000000000000 --- a/packages/Connectivity/framework/src/com/android/connectivity/aidl/INetworkAgent.aidl +++ /dev/null @@ -1,49 +0,0 @@ -/** - * Copyright (c) 2020, 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 perNmissions and - * limitations under the License. - */ -package com.android.connectivity.aidl; - -import android.net.NattKeepalivePacketData; -import android.net.QosFilterParcelable; -import android.net.TcpKeepalivePacketData; - -import com.android.connectivity.aidl.INetworkAgentRegistry; - -/** - * Interface to notify NetworkAgent of connectivity events. - * @hide - */ -oneway interface INetworkAgent { - void onRegistered(in INetworkAgentRegistry registry); - void onDisconnected(); - void onBandwidthUpdateRequested(); - void onValidationStatusChanged(int validationStatus, - in @nullable String captivePortalUrl); - void onSaveAcceptUnvalidated(boolean acceptUnvalidated); - void onStartNattSocketKeepalive(int slot, int intervalDurationMs, - in NattKeepalivePacketData packetData); - void onStartTcpSocketKeepalive(int slot, int intervalDurationMs, - in TcpKeepalivePacketData packetData); - void onStopSocketKeepalive(int slot); - void onSignalStrengthThresholdsUpdated(in int[] thresholds); - void onPreventAutomaticReconnect(); - void onAddNattKeepalivePacketFilter(int slot, - in NattKeepalivePacketData packetData); - void onAddTcpKeepalivePacketFilter(int slot, - in TcpKeepalivePacketData packetData); - void onRemoveKeepalivePacketFilter(int slot); - void onQosFilterCallbackRegistered(int qosCallbackId, in QosFilterParcelable filterParcel); - void onQosCallbackUnregistered(int qosCallbackId); -} diff --git a/packages/Connectivity/framework/src/com/android/connectivity/aidl/INetworkAgentRegistry.aidl b/packages/Connectivity/framework/src/com/android/connectivity/aidl/INetworkAgentRegistry.aidl deleted file mode 100644 index 18d26a7e4baf..000000000000 --- a/packages/Connectivity/framework/src/com/android/connectivity/aidl/INetworkAgentRegistry.aidl +++ /dev/null @@ -1,42 +0,0 @@ -/** - * Copyright (c) 2020, 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 perNmissions and - * limitations under the License. - */ -package com.android.connectivity.aidl; - -import android.net.LinkProperties; -import android.net.Network; -import android.net.NetworkCapabilities; -import android.net.NetworkInfo; -import android.net.NetworkScore; -import android.net.QosSession; -import android.telephony.data.EpsBearerQosSessionAttributes; - -/** - * Interface for NetworkAgents to send network properties. - * @hide - */ -oneway interface INetworkAgentRegistry { - void sendNetworkCapabilities(in NetworkCapabilities nc); - void sendLinkProperties(in LinkProperties lp); - // TODO: consider replacing this by "markConnected()" and removing - void sendNetworkInfo(in NetworkInfo info); - void sendScore(in NetworkScore score); - void sendExplicitlySelected(boolean explicitlySelected, boolean acceptPartial); - void sendSocketKeepaliveEvent(int slot, int reason); - void sendUnderlyingNetworks(in @nullable List networks); - void sendEpsQosSessionAvailable(int callbackId, in QosSession session, in EpsBearerQosSessionAttributes attributes); - void sendQosSessionLost(int qosCallbackId, in QosSession session); - void sendQosCallbackError(int qosCallbackId, int exceptionType); -} -- cgit v1.2.3