LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renaming Ethernet Network Management Classes

Browse Source 
Renaming InternalNetwork* files and classes related to ethernet network
management to EthernetNetwork* as ethernet is the only trasnport these
particular files are used with.

Bug: 210485380
Test: atest EthernetServiceTests
Change-Id: Ieb3915c032ef5fcd6b36eb09878119de7668bb4b
This commit is contained in:
James Mattis
2022-01-28 13:42:38 -08:00
parent 2ed5ef560c
commit 1ecadfa763
8 changed files with 67 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
framework-t/Sources.bp
View File

@@ -125,14 +125,14 @@ filegroup {
name: "framework-connectivity-ethernet-sources", name: "framework-connectivity-ethernet-sources",
srcs: [ srcs: [
"src/android/net/EthernetManager.java", "src/android/net/EthernetManager.java",
"src/android/net/EthernetNetworkManagementException.java",
"src/android/net/EthernetNetworkManagementException.aidl",
"src/android/net/EthernetNetworkSpecifier.java", "src/android/net/EthernetNetworkSpecifier.java",
"src/android/net/EthernetNetworkUpdateRequest.java",
"src/android/net/EthernetNetworkUpdateRequest.aidl",
"src/android/net/IEthernetManager.aidl", "src/android/net/IEthernetManager.aidl",
"src/android/net/IEthernetNetworkManagementListener.aidl",
"src/android/net/IEthernetServiceListener.aidl", "src/android/net/IEthernetServiceListener.aidl",
"src/android/net/IInternalNetworkManagementListener.aidl",
"src/android/net/InternalNetworkUpdateRequest.java",
"src/android/net/InternalNetworkUpdateRequest.aidl",
"src/android/net/InternalNetworkManagementException.java",
"src/android/net/InternalNetworkManagementException.aidl",
"src/android/net/ITetheredInterfaceCallback.aidl", "src/android/net/ITetheredInterfaceCallback.aidl",
], ],
path: "src", path: "src",

18
framework-t/src/android/net/EthernetManager.java
View File

@@ -320,15 +320,15 @@ public class EthernetManager {
} }
private static final class InternalNetworkManagementListener private static final class InternalNetworkManagementListener
extends IInternalNetworkManagementListener.Stub { extends IEthernetNetworkManagementListener.Stub {
@NonNull @NonNull
private final Executor mExecutor; private final Executor mExecutor;
@NonNull @NonNull
private final BiConsumer<Network, InternalNetworkManagementException> mListener; private final BiConsumer<Network, EthernetNetworkManagementException> mListener;
InternalNetworkManagementListener( InternalNetworkManagementListener(
@NonNull final Executor executor, @NonNull final Executor executor,
@NonNull final BiConsumer<Network, InternalNetworkManagementException> listener) { @NonNull final BiConsumer<Network, EthernetNetworkManagementException> listener) {
Objects.requireNonNull(executor, "Pass a non-null executor"); Objects.requireNonNull(executor, "Pass a non-null executor");
Objects.requireNonNull(listener, "Pass a non-null listener"); Objects.requireNonNull(listener, "Pass a non-null listener");
mExecutor = executor; mExecutor = executor;
@@ -338,14 +338,14 @@ public class EthernetManager {
@Override @Override
public void onComplete( public void onComplete(
@Nullable final Network network, @Nullable final Network network,
@Nullable final InternalNetworkManagementException e) { @Nullable final EthernetNetworkManagementException e) {
mExecutor.execute(() -> mListener.accept(network, e)); mExecutor.execute(() -> mListener.accept(network, e));
} }
} }
private InternalNetworkManagementListener getInternalNetworkManagementListener( private InternalNetworkManagementListener getInternalNetworkManagementListener(
@Nullable final Executor executor, @Nullable final Executor executor,
@Nullable final BiConsumer<Network, InternalNetworkManagementException> listener) { @Nullable final BiConsumer<Network, EthernetNetworkManagementException> listener) {
if (null != listener) { if (null != listener) {
Objects.requireNonNull(executor, "Pass a non-null executor, or a null listener"); Objects.requireNonNull(executor, "Pass a non-null executor, or a null listener");
} }
@@ -360,9 +360,9 @@ public class EthernetManager {
private void updateConfiguration( private void updateConfiguration(
@NonNull String iface, @NonNull String iface,
@NonNull InternalNetworkUpdateRequest request, @NonNull EthernetNetworkUpdateRequest request,
@Nullable @CallbackExecutor Executor executor, @Nullable @CallbackExecutor Executor executor,
@Nullable BiConsumer<Network, InternalNetworkManagementException> listener) { @Nullable BiConsumer<Network, EthernetNetworkManagementException> listener) {
final InternalNetworkManagementListener proxy = getInternalNetworkManagementListener( final InternalNetworkManagementListener proxy = getInternalNetworkManagementListener(
executor, listener); executor, listener);
try { try {
@@ -375,7 +375,7 @@ public class EthernetManager {
private void connectNetwork( private void connectNetwork(
@NonNull String iface, @NonNull String iface,
@Nullable @CallbackExecutor Executor executor, @Nullable @CallbackExecutor Executor executor,
@Nullable BiConsumer<Network, InternalNetworkManagementException> listener) { @Nullable BiConsumer<Network, EthernetNetworkManagementException> listener) {
final InternalNetworkManagementListener proxy = getInternalNetworkManagementListener( final InternalNetworkManagementListener proxy = getInternalNetworkManagementListener(
executor, listener); executor, listener);
try { try {
@@ -388,7 +388,7 @@ public class EthernetManager {
private void disconnectNetwork( private void disconnectNetwork(
@NonNull String iface, @NonNull String iface,
@Nullable @CallbackExecutor Executor executor, @Nullable @CallbackExecutor Executor executor,
@Nullable BiConsumer<Network, InternalNetworkManagementException> listener) { @Nullable BiConsumer<Network, EthernetNetworkManagementException> listener) {
final InternalNetworkManagementListener proxy = getInternalNetworkManagementListener( final InternalNetworkManagementListener proxy = getInternalNetworkManagementListener(
executor, listener); executor, listener);
try { try {

2
framework-t/src/android/net/InternalNetworkManagementException.aidl → framework-t/src/android/net/EthernetNetworkManagementException.aidl
View File

@@ -16,4 +16,4 @@
package android.net; package android.net;
parcelable InternalNetworkManagementException; parcelable EthernetNetworkManagementException;

18
framework-t/src/android/net/InternalNetworkManagementException.java → framework-t/src/android/net/EthernetNetworkManagementException.java
View File

@@ -23,11 +23,11 @@ import android.os.Parcelable;
import java.util.Objects; import java.util.Objects;
/** @hide */ /** @hide */
public final class InternalNetworkManagementException public final class EthernetNetworkManagementException
extends RuntimeException implements Parcelable { extends RuntimeException implements Parcelable {
/* @hide */ /* @hide */
public InternalNetworkManagementException(@NonNull final String errorMessage) { public EthernetNetworkManagementException(@NonNull final String errorMessage) {
super(errorMessage); super(errorMessage);
} }
@@ -40,7 +40,7 @@ public final class InternalNetworkManagementException
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (this == obj) return true; if (this == obj) return true;
if (obj == null || getClass() != obj.getClass()) return false; if (obj == null || getClass() != obj.getClass()) return false;
final InternalNetworkManagementException that = (InternalNetworkManagementException) obj; final EthernetNetworkManagementException that = (EthernetNetworkManagementException) obj;
return Objects.equals(getMessage(), that.getMessage()); return Objects.equals(getMessage(), that.getMessage());
} }
@@ -56,16 +56,16 @@ public final class InternalNetworkManagementException
} }
@NonNull @NonNull
public static final Parcelable.Creator<InternalNetworkManagementException> CREATOR = public static final Parcelable.Creator<EthernetNetworkManagementException> CREATOR =
new Parcelable.Creator<InternalNetworkManagementException>() { new Parcelable.Creator<EthernetNetworkManagementException>() {
@Override @Override
public InternalNetworkManagementException[] newArray(int size) { public EthernetNetworkManagementException[] newArray(int size) {
return new InternalNetworkManagementException[size]; return new EthernetNetworkManagementException[size];
} }
@Override @Override
public InternalNetworkManagementException createFromParcel(@NonNull Parcel source) { public EthernetNetworkManagementException createFromParcel(@NonNull Parcel source) {
return new InternalNetworkManagementException(source.readString()); return new EthernetNetworkManagementException(source.readString());
} }
}; };
} }

2
framework-t/src/android/net/InternalNetworkUpdateRequest.aidl → framework-t/src/android/net/EthernetNetworkUpdateRequest.aidl
View File

@@ -16,4 +16,4 @@
package android.net; package android.net;
parcelable InternalNetworkUpdateRequest; parcelable EthernetNetworkUpdateRequest;

22
framework-t/src/android/net/InternalNetworkUpdateRequest.java → framework-t/src/android/net/EthernetNetworkUpdateRequest.java
View File

@@ -23,7 +23,7 @@ import android.os.Parcelable;
import java.util.Objects; import java.util.Objects;
/** @hide */ /** @hide */
public final class InternalNetworkUpdateRequest implements Parcelable { public final class EthernetNetworkUpdateRequest implements Parcelable {
@NonNull @NonNull
private final StaticIpConfiguration mIpConfig; private final StaticIpConfiguration mIpConfig;
@NonNull @NonNull
@@ -40,7 +40,7 @@ public final class InternalNetworkUpdateRequest implements Parcelable {
} }
/** @hide */ /** @hide */
public InternalNetworkUpdateRequest(@NonNull final StaticIpConfiguration ipConfig, public EthernetNetworkUpdateRequest(@NonNull final StaticIpConfiguration ipConfig,
@NonNull final NetworkCapabilities networkCapabilities) { @NonNull final NetworkCapabilities networkCapabilities) {
Objects.requireNonNull(ipConfig); Objects.requireNonNull(ipConfig);
Objects.requireNonNull(networkCapabilities); Objects.requireNonNull(networkCapabilities);
@@ -48,7 +48,7 @@ public final class InternalNetworkUpdateRequest implements Parcelable {
mNetworkCapabilities = new NetworkCapabilities(networkCapabilities); mNetworkCapabilities = new NetworkCapabilities(networkCapabilities);
} }
private InternalNetworkUpdateRequest(@NonNull final Parcel source) { private EthernetNetworkUpdateRequest(@NonNull final Parcel source) {
Objects.requireNonNull(source); Objects.requireNonNull(source);
mIpConfig = StaticIpConfiguration.CREATOR.createFromParcel(source); mIpConfig = StaticIpConfiguration.CREATOR.createFromParcel(source);
mNetworkCapabilities = NetworkCapabilities.CREATOR.createFromParcel(source); mNetworkCapabilities = NetworkCapabilities.CREATOR.createFromParcel(source);
@@ -56,7 +56,7 @@ public final class InternalNetworkUpdateRequest implements Parcelable {
@Override @Override
public String toString() { public String toString() {
return "InternalNetworkUpdateRequest{" return "EthernetNetworkUpdateRequest{"
+ "mIpConfig=" + mIpConfig + "mIpConfig=" + mIpConfig
+ ", mNetworkCapabilities=" + mNetworkCapabilities + '}'; + ", mNetworkCapabilities=" + mNetworkCapabilities + '}';
} }
@@ -65,7 +65,7 @@ public final class InternalNetworkUpdateRequest implements Parcelable {
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()) return false;
InternalNetworkUpdateRequest that = (InternalNetworkUpdateRequest) o; EthernetNetworkUpdateRequest that = (EthernetNetworkUpdateRequest) o;
return Objects.equals(that.getIpConfig(), mIpConfig) return Objects.equals(that.getIpConfig(), mIpConfig)
&& Objects.equals(that.getNetworkCapabilities(), mNetworkCapabilities); && Objects.equals(that.getNetworkCapabilities(), mNetworkCapabilities);
@@ -88,16 +88,16 @@ public final class InternalNetworkUpdateRequest implements Parcelable {
} }
@NonNull @NonNull
public static final Parcelable.Creator<InternalNetworkUpdateRequest> CREATOR = public static final Parcelable.Creator<EthernetNetworkUpdateRequest> CREATOR =
new Parcelable.Creator<InternalNetworkUpdateRequest>() { new Parcelable.Creator<EthernetNetworkUpdateRequest>() {
@Override @Override
public InternalNetworkUpdateRequest[] newArray(int size) { public EthernetNetworkUpdateRequest[] newArray(int size) {
return new InternalNetworkUpdateRequest[size]; return new EthernetNetworkUpdateRequest[size];
} }
@Override @Override
public InternalNetworkUpdateRequest createFromParcel(@NonNull Parcel source) { public EthernetNetworkUpdateRequest createFromParcel(@NonNull Parcel source) {
return new InternalNetworkUpdateRequest(source); return new EthernetNetworkUpdateRequest(source);
} }
}; };
} }

12
framework-t/src/android/net/IEthernetManager.aidl
View File

@@ -18,8 +18,8 @@ package android.net;
import android.net.IpConfiguration; import android.net.IpConfiguration;
import android.net.IEthernetServiceListener; import android.net.IEthernetServiceListener;
import android.net.IInternalNetworkManagementListener; import android.net.IEthernetNetworkManagementListener;
import android.net.InternalNetworkUpdateRequest; import android.net.EthernetNetworkUpdateRequest;
import android.net.ITetheredInterfaceCallback; import android.net.ITetheredInterfaceCallback;
/** /**
@@ -38,8 +38,8 @@ interface IEthernetManager
void setIncludeTestInterfaces(boolean include); void setIncludeTestInterfaces(boolean include);
void requestTetheredInterface(in ITetheredInterfaceCallback callback); void requestTetheredInterface(in ITetheredInterfaceCallback callback);
void releaseTetheredInterface(in ITetheredInterfaceCallback callback); void releaseTetheredInterface(in ITetheredInterfaceCallback callback);
void updateConfiguration(String iface, in InternalNetworkUpdateRequest request, void updateConfiguration(String iface, in EthernetNetworkUpdateRequest request,
in IInternalNetworkManagementListener listener); in IEthernetNetworkManagementListener listener);
void connectNetwork(String iface, in IInternalNetworkManagementListener listener); void connectNetwork(String iface, in IEthernetNetworkManagementListener listener);
void disconnectNetwork(String iface, in IInternalNetworkManagementListener listener); void disconnectNetwork(String iface, in IEthernetNetworkManagementListener listener);
} }

25
framework-t/src/android/net/IEthernetNetworkManagementListener.aidl Normal file
View File

@@ -0,0 +1,25 @@
/**
* Copyright (c) 2021, 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.
*/
package android.net;
import android.net.EthernetNetworkManagementException;
import android.net.Network;
/** @hide */
oneway interface IEthernetNetworkManagementListener {
void onComplete(in Network network, in EthernetNetworkManagementException exception);
}