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

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

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