Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 580f7ebb authored by Patrick Rohr's avatar Patrick Rohr Committed by Automerger Merge Worker
Browse files

Merge "Split out the ethernet API surface and use framework-connectivity-t" am: c02e97dc 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958559

Change-Id: Icf47f5e5294dcc3f368237c312263481e4a678bd
parents b38d7f3d c02e97dc

boot/hiddenapi/hiddenapi-max-target-o.txt

+0 −41
Original line number Diff line number Diff line
@@ -35278,14 +35278,6 @@ Landroid/net/DhcpResults;->setLeaseDuration(I)V 
Landroid/net/DhcpResults;->setServerAddress(Ljava/lang/String;)Z

Landroid/net/DhcpResults;->setVendorInfo(Ljava/lang/String;)V

Landroid/net/DhcpResults;->TAG:Ljava/lang/String;

Landroid/net/EthernetManager;-><init>(Landroid/content/Context;Landroid/net/IEthernetManager;)V

Landroid/net/EthernetManager;->mContext:Landroid/content/Context;

Landroid/net/EthernetManager;->mHandler:Landroid/os/Handler;

Landroid/net/EthernetManager;->mListeners:Ljava/util/ArrayList;

Landroid/net/EthernetManager;->mService:Landroid/net/IEthernetManager;

Landroid/net/EthernetManager;->mServiceListener:Landroid/net/IEthernetServiceListener$Stub;

Landroid/net/EthernetManager;->MSG_AVAILABILITY_CHANGED:I

Landroid/net/EthernetManager;->TAG:Ljava/lang/String;

Landroid/net/EventLogTags;-><init>()V

Landroid/net/EventLogTags;->NTP_FAILURE:I

Landroid/net/EventLogTags;->NTP_SUCCESS:I
@@ -35319,39 +35311,6 @@ Landroid/net/http/X509TrustManagerExtensions;->mCheckServerTrusted:Ljava/lang/re 
Landroid/net/http/X509TrustManagerExtensions;->mDelegate:Lcom/android/org/conscrypt/TrustManagerImpl;

Landroid/net/http/X509TrustManagerExtensions;->mIsSameTrustConfiguration:Ljava/lang/reflect/Method;

Landroid/net/http/X509TrustManagerExtensions;->mTrustManager:Ljavax/net/ssl/X509TrustManager;

Landroid/net/IEthernetManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V

Landroid/net/IEthernetManager$Stub$Proxy;->addListener(Landroid/net/IEthernetServiceListener;)V

Landroid/net/IEthernetManager$Stub$Proxy;->getAvailableInterfaces()[Ljava/lang/String;

Landroid/net/IEthernetManager$Stub$Proxy;->getConfiguration(Ljava/lang/String;)Landroid/net/IpConfiguration;

Landroid/net/IEthernetManager$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;

Landroid/net/IEthernetManager$Stub$Proxy;->isAvailable(Ljava/lang/String;)Z

Landroid/net/IEthernetManager$Stub$Proxy;->mRemote:Landroid/os/IBinder;

Landroid/net/IEthernetManager$Stub$Proxy;->removeListener(Landroid/net/IEthernetServiceListener;)V

Landroid/net/IEthernetManager$Stub$Proxy;->setConfiguration(Ljava/lang/String;Landroid/net/IpConfiguration;)V

Landroid/net/IEthernetManager$Stub;-><init>()V

Landroid/net/IEthernetManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/IEthernetManager;

Landroid/net/IEthernetManager$Stub;->DESCRIPTOR:Ljava/lang/String;

Landroid/net/IEthernetManager$Stub;->TRANSACTION_addListener:I

Landroid/net/IEthernetManager$Stub;->TRANSACTION_getAvailableInterfaces:I

Landroid/net/IEthernetManager$Stub;->TRANSACTION_getConfiguration:I

Landroid/net/IEthernetManager$Stub;->TRANSACTION_isAvailable:I

Landroid/net/IEthernetManager$Stub;->TRANSACTION_removeListener:I

Landroid/net/IEthernetManager$Stub;->TRANSACTION_setConfiguration:I

Landroid/net/IEthernetManager;->addListener(Landroid/net/IEthernetServiceListener;)V

Landroid/net/IEthernetManager;->getAvailableInterfaces()[Ljava/lang/String;

Landroid/net/IEthernetManager;->getConfiguration(Ljava/lang/String;)Landroid/net/IpConfiguration;

Landroid/net/IEthernetManager;->isAvailable(Ljava/lang/String;)Z

Landroid/net/IEthernetManager;->removeListener(Landroid/net/IEthernetServiceListener;)V

Landroid/net/IEthernetManager;->setConfiguration(Ljava/lang/String;Landroid/net/IpConfiguration;)V

Landroid/net/IEthernetServiceListener$Stub$Proxy;-><init>(Landroid/os/IBinder;)V

Landroid/net/IEthernetServiceListener$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;

Landroid/net/IEthernetServiceListener$Stub$Proxy;->mRemote:Landroid/os/IBinder;

Landroid/net/IEthernetServiceListener$Stub$Proxy;->onAvailabilityChanged(Ljava/lang/String;Z)V

Landroid/net/IEthernetServiceListener$Stub;-><init>()V

Landroid/net/IEthernetServiceListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/IEthernetServiceListener;

Landroid/net/IEthernetServiceListener$Stub;->DESCRIPTOR:Ljava/lang/String;

Landroid/net/IEthernetServiceListener$Stub;->TRANSACTION_onAvailabilityChanged:I

Landroid/net/IEthernetServiceListener;->onAvailabilityChanged(Ljava/lang/String;Z)V

Landroid/net/IIpConnectivityMetrics$Stub$Proxy;-><init>(Landroid/os/IBinder;)V

Landroid/net/IIpConnectivityMetrics$Stub$Proxy;->addNetdEventCallback(ILandroid/net/INetdEventCallback;)Z

Landroid/net/IIpConnectivityMetrics$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;

core/api/current.txt

+0 −8
Original line number Diff line number Diff line
@@ -25203,14 +25203,6 @@ package android.net { 
    method public int getUid();

  }













  public final class EthernetNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {













    ctor public EthernetNetworkSpecifier(@NonNull String);













    method public int describeContents();













    method @Nullable public String getInterfaceName();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.net.EthernetNetworkSpecifier> CREATOR;













  }



























  public final class Ikev2VpnProfile extends android.net.PlatformVpnProfile {















    method @NonNull public java.util.List<java.lang.String> getAllowedAlgorithms();















    method public int getMaxMtu();

























core/api/module-lib-current.txt



+0
−16




























Original line number
Diff line number
Diff line








@@ -193,22 +193,6 @@ package android.media.session {





























package android.net {





























  public class EthernetManager {













    method @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE) public void addInterfaceStateListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.EthernetManager.InterfaceStateListener);













    method public void removeInterfaceStateListener(@NonNull android.net.EthernetManager.InterfaceStateListener);













    method public void setIncludeTestInterfaces(boolean);













    field public static final int ROLE_CLIENT = 1; // 0x1













    field public static final int ROLE_NONE = 0; // 0x0













    field public static final int ROLE_SERVER = 2; // 0x2













    field public static final int STATE_ABSENT = 0; // 0x0













    field public static final int STATE_LINK_DOWN = 1; // 0x1













    field public static final int STATE_LINK_UP = 2; // 0x2













  }



























  public static interface EthernetManager.InterfaceStateListener {













    method public void onInterfaceStateChanged(@NonNull String, int, int, @Nullable android.net.IpConfiguration);













  }





























  public class LocalSocket implements java.io.Closeable {















    ctor public LocalSocket(@NonNull java.io.FileDescriptor);















  }

































core/api/system-current.txt



+0
−39




























Original line number
Diff line number
Diff line








@@ -7063,45 +7063,6 @@ package android.metrics {



























package android.net {



























  public class EthernetManager {













    method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.MANAGE_ETHERNET_NETWORKS}) public void connectNetwork(@NonNull String, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.BiConsumer<android.net.Network,android.net.EthernetNetworkManagementException>);













    method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.MANAGE_ETHERNET_NETWORKS}) public void disconnectNetwork(@NonNull String, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.BiConsumer<android.net.Network,android.net.EthernetNetworkManagementException>);













    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public android.net.EthernetManager.TetheredInterfaceRequest requestTetheredInterface(@NonNull java.util.concurrent.Executor, @NonNull android.net.EthernetManager.TetheredInterfaceCallback);













    method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.MANAGE_ETHERNET_NETWORKS}) public void updateConfiguration(@NonNull String, @NonNull android.net.EthernetNetworkUpdateRequest, @Nullable java.util.concurrent.Executor, @Nullable java.util.function.BiConsumer<android.net.Network,android.net.EthernetNetworkManagementException>);













  }

























  public static interface EthernetManager.TetheredInterfaceCallback {













    method public void onAvailable(@NonNull String);













    method public void onUnavailable();













  }

























  public static class EthernetManager.TetheredInterfaceRequest {













    method public void release();













  }

























  public final class EthernetNetworkManagementException extends java.lang.RuntimeException implements android.os.Parcelable {













    ctor public EthernetNetworkManagementException(@NonNull String);













    method public int describeContents();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.net.EthernetNetworkManagementException> CREATOR;













  }

























  public final class EthernetNetworkUpdateRequest implements android.os.Parcelable {













    method public int describeContents();













    method @NonNull public android.net.IpConfiguration getIpConfiguration();













    method @Nullable public android.net.NetworkCapabilities getNetworkCapabilities();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.net.EthernetNetworkUpdateRequest> CREATOR;













  }

























  public static final class EthernetNetworkUpdateRequest.Builder {













    ctor public EthernetNetworkUpdateRequest.Builder();













    ctor public EthernetNetworkUpdateRequest.Builder(@NonNull android.net.EthernetNetworkUpdateRequest);













    method @NonNull public android.net.EthernetNetworkUpdateRequest build();













    method @NonNull public android.net.EthernetNetworkUpdateRequest.Builder setIpConfiguration(@NonNull android.net.IpConfiguration);













    method @NonNull public android.net.EthernetNetworkUpdateRequest.Builder setNetworkCapabilities(@Nullable android.net.NetworkCapabilities);













  }



























  public final class MatchAllNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {















    ctor public MatchAllNetworkSpecifier();















    method public int describeContents();

































core/java/android/app/SystemServiceRegistry.java



+0
−11




























Original line number
Diff line number
Diff line








@@ -125,8 +125,6 @@ import android.media.tv.tunerresourcemanager.ITunerResourceManager;













import android.media.tv.tunerresourcemanager.TunerResourceManager;















import android.net.ConnectivityFrameworkInitializer;















import android.net.ConnectivityFrameworkInitializerTiramisu;













import android.net.EthernetManager;













import android.net.IEthernetManager;















import android.net.INetworkPolicyManager;















import android.net.IPacProxyManager;















import android.net.IVpnManager;










@@ -764,15 +762,6 @@ public final class SystemServiceRegistry {













                return new LowpanManager(ctx.getOuterContext(), service);















            }});





























        registerService(Context.ETHERNET_SERVICE, EthernetManager.class,













                new CachedServiceFetcher<EthernetManager>() {













            @Override













            public EthernetManager createService(ContextImpl ctx) throws ServiceNotFoundException {













                IBinder b = ServiceManager.getServiceOrThrow(Context.ETHERNET_SERVICE);













                IEthernetManager service = IEthernetManager.Stub.asInterface(b);













                return new EthernetManager(ctx.getOuterContext(), service);













            }});





























        registerService(Context.WIFI_NL80211_SERVICE, WifiNl80211Manager.class,















                new CachedServiceFetcher<WifiNl80211Manager>() {















                    @Override