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

Commit d49d45c2 authored by James Mattis's avatar James Mattis Committed by Automerger Merge Worker
Browse files

Merge "Renaming Ethernet Network Management Classes" am: 525001ee 

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

Change-Id: I6acadd19dfc733dd68b79cd4f79c98633f711240
parents 5901c382 525001ee

packages/ConnectivityT/framework-t/Android.bp

+5 −5
Original line number Diff line number Diff line
@@ -125,14 +125,14 @@ filegroup { 
    name: "framework-connectivity-ethernet-sources",

    srcs: [

        "src/android/net/EthernetManager.java",

        "src/android/net/EthernetNetworkManagementException.java",

        "src/android/net/EthernetNetworkManagementException.aidl",

        "src/android/net/EthernetNetworkSpecifier.java",

        "src/android/net/EthernetNetworkUpdateRequest.java",

        "src/android/net/EthernetNetworkUpdateRequest.aidl",

        "src/android/net/IEthernetManager.aidl",

        "src/android/net/IEthernetNetworkManagementListener.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",

    ],

    path: "src",

packages/ConnectivityT/framework-t/src/android/net/EthernetManager.java

+9 −9
Original line number Diff line number Diff line
@@ -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 {

packages/ConnectivityT/framework-t/src/android/net/InternalNetworkManagementException.aidl→packages/ConnectivityT/framework-t/src/android/net/EthernetNetworkManagementException.aidl

+1 −1
Original line number Diff line number Diff line
@@ -16,4 +16,4 @@ 


 package android.net;



 parcelable InternalNetworkManagementException;
 
 No newline at end of file
 
 parcelable EthernetNetworkManagementException;
 
 No newline at end of file

packages/ConnectivityT/framework-t/src/android/net/InternalNetworkManagementException.java→packages/ConnectivityT/framework-t/src/android/net/EthernetNetworkManagementException.java

+9 −9
Original line number Diff line number Diff line
@@ -23,11 +23,11 @@ import android.os.Parcelable; 
import java.util.Objects;



/** @hide */

public final class InternalNetworkManagementException

public final class EthernetNetworkManagementException

        extends RuntimeException implements Parcelable {



    /* @hide */

    public InternalNetworkManagementException(@NonNull final String errorMessage) {

    public EthernetNetworkManagementException(@NonNull final String errorMessage) {

        super(errorMessage);

    }
@@ -40,7 +40,7 @@ public final class InternalNetworkManagementException 
    public boolean equals(Object obj) {

        if (this == obj) return true;

        if (obj == null || getClass() != obj.getClass()) return false;

        final InternalNetworkManagementException that = (InternalNetworkManagementException) obj;

        final EthernetNetworkManagementException that = (EthernetNetworkManagementException) obj;



        return Objects.equals(getMessage(), that.getMessage());

    }
@@ -56,16 +56,16 @@ public final class InternalNetworkManagementException 
    }



    @NonNull

    public static final Parcelable.Creator<InternalNetworkManagementException> CREATOR =

            new Parcelable.Creator<InternalNetworkManagementException>() {

    public static final Parcelable.Creator<EthernetNetworkManagementException> CREATOR =

            new Parcelable.Creator<EthernetNetworkManagementException>() {

                @Override

                public InternalNetworkManagementException[] newArray(int size) {

                    return new InternalNetworkManagementException[size];

                public EthernetNetworkManagementException[] newArray(int size) {

                    return new EthernetNetworkManagementException[size];

                }



                @Override

                public InternalNetworkManagementException createFromParcel(@NonNull Parcel source) {

                    return new InternalNetworkManagementException(source.readString());

                public EthernetNetworkManagementException createFromParcel(@NonNull Parcel source) {

                    return new EthernetNetworkManagementException(source.readString());

                }

            };

}

packages/ConnectivityT/framework-t/src/android/net/InternalNetworkUpdateRequest.aidl→packages/ConnectivityT/framework-t/src/android/net/EthernetNetworkUpdateRequest.aidl

+1 −1
Original line number Diff line number Diff line
@@ -16,4 +16,4 @@ 


 package android.net;



 parcelable InternalNetworkUpdateRequest;
 
 No newline at end of file
 
 parcelable EthernetNetworkUpdateRequest;
 
 No newline at end of file