Marking eth network management APIs @SystemApi
Annotating ethernet network management APIs in EthernetManager with @SystemApi. Bug: 210485380 Test: atest EthernetServiceTests atest CtsNetTestCasesLatestSdk Change-Id: I10429441fd4d7b9bcaa7437b844420a43a415d72 Merged-In: I10429441fd4d7b9bcaa7437b844420a43a415d72
This commit is contained in:
James Mattis
@@ -19,12 +19,14 @@ package android.net;
|
||||
import android.annotation.CallbackExecutor;
|
||||
import android.annotation.NonNull;
|
||||
import android.annotation.Nullable;
|
||||
import android.annotation.RequiresFeature;
|
||||
import android.annotation.RequiresPermission;
|
||||
import android.annotation.SystemApi;
|
||||
import android.annotation.SystemService;
|
||||
import android.annotation.TestApi;
|
||||
import android.compat.annotation.UnsupportedAppUsage;
|
||||
import android.content.Context;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.os.Build;
|
||||
import android.os.RemoteException;
|
||||
|
||||
@@ -358,12 +360,43 @@ public class EthernetManager {
|
||||
return proxy;
|
||||
}
|
||||
|
||||
@RequiresPermission(android.Manifest.permission.MANAGE_ETHERNET_NETWORKS)
|
||||
private void updateConfiguration(
|
||||
/**
|
||||
* Updates the configuration of an automotive device's ethernet network.
|
||||
*
|
||||
* The {@link EthernetNetworkUpdateRequest} {@code request} argument describes how to update the
|
||||
* configuration for this network.
|
||||
* Use {@link StaticIpConfiguration.Builder} to build a {@code StaticIpConfiguration} object for
|
||||
* this network to put inside the {@code request}.
|
||||
* Similarly, use {@link NetworkCapabilities.Builder} to build a {@code NetworkCapabilities}
|
||||
* object for this network to put inside the {@code request}.
|
||||
*
|
||||
* If non-null, the listener will be called exactly once after this is called, unless
|
||||
* a synchronous exception was thrown.
|
||||
*
|
||||
* @param iface the name of the interface to act upon.
|
||||
* @param request the {@link EthernetNetworkUpdateRequest} used to set an ethernet network's
|
||||
* {@link StaticIpConfiguration} and {@link NetworkCapabilities} values.
|
||||
* @param executor an {@link Executor} to execute the listener on. Optional if listener is null.
|
||||
* @param listener an optional {@link BiConsumer} to listen for completion of the operation.
|
||||
* @throws SecurityException if the process doesn't hold
|
||||
* {@link android.Manifest.permission.MANAGE_ETHERNET_NETWORKS}.
|
||||
* @throws UnsupportedOperationException if called on a non-automotive device or on an
|
||||
* unsupported interface.
|
||||
* @hide
|
||||
*/
|
||||
@SystemApi
|
||||
@RequiresPermission(anyOf = {
|
||||
NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK,
|
||||
android.Manifest.permission.NETWORK_STACK,
|
||||
android.Manifest.permission.MANAGE_ETHERNET_NETWORKS})
|
||||
@RequiresFeature(PackageManager.FEATURE_AUTOMOTIVE)
|
||||
public void updateConfiguration(
|
||||
@NonNull String iface,
|
||||
@NonNull EthernetNetworkUpdateRequest request,
|
||||
@Nullable @CallbackExecutor Executor executor,
|
||||
@Nullable BiConsumer<Network, EthernetNetworkManagementException> listener) {
|
||||
Objects.requireNonNull(iface, "iface must be non-null");
|
||||
Objects.requireNonNull(request, "request must be non-null");
|
||||
final InternalNetworkManagementListener proxy = getInternalNetworkManagementListener(
|
||||
executor, listener);
|
||||
try {
|
||||
@@ -373,11 +406,34 @@ public class EthernetManager {
|
||||
}
|
||||
}
|
||||
|
||||
@RequiresPermission(android.Manifest.permission.MANAGE_ETHERNET_NETWORKS)
|
||||
private void connectNetwork(
|
||||
/**
|
||||
* Set an ethernet network's link state up.
|
||||
*
|
||||
* When the link is successfully turned up, the listener will be called with the resulting
|
||||
* network. If any error or unexpected condition happens while the system tries to turn the
|
||||
* interface up, the listener will be called with an appropriate exception.
|
||||
* The listener is guaranteed to be called exactly once for each call to this method, but this
|
||||
* may take an unbounded amount of time depending on the actual network conditions.
|
||||
*
|
||||
* @param iface the name of the interface to act upon.
|
||||
* @param executor an {@link Executor} to execute the listener on. Optional if listener is null.
|
||||
* @param listener an optional {@link BiConsumer} to listen for completion of the operation.
|
||||
* @throws SecurityException if the process doesn't hold
|
||||
* {@link android.Manifest.permission.MANAGE_ETHERNET_NETWORKS}.
|
||||
* @throws UnsupportedOperationException if called on a non-automotive device.
|
||||
* @hide
|
||||
*/
|
||||
@SystemApi
|
||||
@RequiresPermission(anyOf = {
|
||||
NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK,
|
||||
android.Manifest.permission.NETWORK_STACK,
|
||||
android.Manifest.permission.MANAGE_ETHERNET_NETWORKS})
|
||||
@RequiresFeature(PackageManager.FEATURE_AUTOMOTIVE)
|
||||
public void connectNetwork(
|
||||
@NonNull String iface,
|
||||
@Nullable @CallbackExecutor Executor executor,
|
||||
@Nullable BiConsumer<Network, EthernetNetworkManagementException> listener) {
|
||||
Objects.requireNonNull(iface, "iface must be non-null");
|
||||
final InternalNetworkManagementListener proxy = getInternalNetworkManagementListener(
|
||||
executor, listener);
|
||||
try {
|
||||
@@ -387,11 +443,33 @@ public class EthernetManager {
|
||||
}
|
||||
}
|
||||
|
||||
@RequiresPermission(android.Manifest.permission.MANAGE_ETHERNET_NETWORKS)
|
||||
private void disconnectNetwork(
|
||||
/**
|
||||
* Set an ethernet network's link state down.
|
||||
*
|
||||
* When the link is successfully turned down, the listener will be called with the network that
|
||||
* was torn down, if any. If any error or unexpected condition happens while the system tries to
|
||||
* turn the interface down, the listener will be called with an appropriate exception.
|
||||
* The listener is guaranteed to be called exactly once for each call to this method.
|
||||
*
|
||||
* @param iface the name of the interface to act upon.
|
||||
* @param executor an {@link Executor} to execute the listener on. Optional if listener is null.
|
||||
* @param listener an optional {@link BiConsumer} to listen for completion of the operation.
|
||||
* @throws SecurityException if the process doesn't hold
|
||||
* {@link android.Manifest.permission.MANAGE_ETHERNET_NETWORKS}.
|
||||
* @throws UnsupportedOperationException if called on a non-automotive device.
|
||||
* @hide
|
||||
*/
|
||||
@SystemApi
|
||||
@RequiresPermission(anyOf = {
|
||||
NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK,
|
||||
android.Manifest.permission.NETWORK_STACK,
|
||||
android.Manifest.permission.MANAGE_ETHERNET_NETWORKS})
|
||||
@RequiresFeature(PackageManager.FEATURE_AUTOMOTIVE)
|
||||
public void disconnectNetwork(
|
||||
@NonNull String iface,
|
||||
@Nullable @CallbackExecutor Executor executor,
|
||||
@Nullable BiConsumer<Network, EthernetNetworkManagementException> listener) {
|
||||
Objects.requireNonNull(iface, "iface must be non-null");
|
||||
final InternalNetworkManagementListener proxy = getInternalNetworkManagementListener(
|
||||
executor, listener);
|
||||
try {
|
||||
|
||||
Reference in New Issue
Block a user