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

Commit 9ff27e58 authored by James Mattis's avatar James Mattis Committed by Gerrit Code Review
Browse files

Merge changes from topic "railway_stub" 

* changes:
  eth manager updates for network management APIs
  aidl and Parcelable defintions for eth management
parents 1d6f1c9d 3dd562ab

core/java/android/net/IInternalNetworkManagementListener.aidl

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/**

 * 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.InternalNetworkManagementException;

import android.net.Network;



/** @hide */

oneway interface IInternalNetworkManagementListener {

    void onComplete(in Network network, in InternalNetworkManagementException exception);

}
 
 No newline at end of file

core/java/android/net/InternalNetworkManagementException.aidl

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * 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;



 parcelable InternalNetworkManagementException;
 
 No newline at end of file

core/java/android/net/InternalNetworkManagementException.java

0 → 100644
+59 −0
Original line number Diff line number Diff line 
/*

 * 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.annotation.NonNull;

import android.os.Parcel;

import android.os.Parcelable;



/** @hide */

public final class InternalNetworkManagementException

        extends RuntimeException implements Parcelable {



    /* @hide */

    public InternalNetworkManagementException(@NonNull final Throwable t) {

        super(t);

    }



    private InternalNetworkManagementException(@NonNull final Parcel source) {

        super(source.readString());

    }



    @Override

    public void writeToParcel(@NonNull Parcel dest, int flags) {

        dest.writeString(getCause().getMessage());

    }



    @Override

    public int describeContents() {

        return 0;

    }



    @NonNull

    public static final Parcelable.Creator<InternalNetworkManagementException> CREATOR =

            new Parcelable.Creator<InternalNetworkManagementException>() {

                @Override

                public InternalNetworkManagementException[] newArray(int size) {

                    return new InternalNetworkManagementException[size];

                }



                @Override

                public InternalNetworkManagementException createFromParcel(@NonNull Parcel source) {

                    return new InternalNetworkManagementException(source);

                }

            };

}

core/java/android/net/InternalNetworkUpdateRequest.aidl

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * 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;



 parcelable InternalNetworkUpdateRequest;
 
 No newline at end of file

core/java/android/net/InternalNetworkUpdateRequest.java

0 → 100644
+108 −0
Original line number Diff line number Diff line 
/*

 * 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.annotation.NonNull;

import android.annotation.Nullable;

import android.os.Parcel;

import android.os.Parcelable;



import java.util.Objects;



/** @hide */

public final class InternalNetworkUpdateRequest implements Parcelable {

    @NonNull

    private final StaticIpConfiguration mIpConfig;

    @Nullable

    private final NetworkCapabilities mNetworkCapabilities;



    @NonNull

    public StaticIpConfiguration getIpConfig() {

        return new StaticIpConfiguration(mIpConfig);

    }



    @NonNull

    public NetworkCapabilities getNetworkCapabilities() {

        return mNetworkCapabilities == null

                ? null : new NetworkCapabilities(mNetworkCapabilities);

    }



    /** @hide */

    public InternalNetworkUpdateRequest(@NonNull final StaticIpConfiguration ipConfig,

            @Nullable final NetworkCapabilities networkCapabilities) {

        Objects.requireNonNull(ipConfig);

        mIpConfig = new StaticIpConfiguration(ipConfig);

        if (null == networkCapabilities) {

            mNetworkCapabilities = null;

        } else {

            mNetworkCapabilities = new NetworkCapabilities(networkCapabilities);

        }

    }



    private InternalNetworkUpdateRequest(@NonNull final Parcel source) {

        Objects.requireNonNull(source);

        mIpConfig = StaticIpConfiguration.CREATOR.createFromParcel(source);

        mNetworkCapabilities = NetworkCapabilities.CREATOR.createFromParcel(source);

    }



    @Override

    public String toString() {

        return "InternalNetworkUpdateRequest{"

                + "mIpConfig=" + mIpConfig

                + ", mNetworkCapabilities=" + mNetworkCapabilities + '}';

    }



    @Override

    public boolean equals(Object o) {

        if (this == o) return true;

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

        InternalNetworkUpdateRequest that = (InternalNetworkUpdateRequest) o;



        return Objects.equals(that.getIpConfig(), mIpConfig)

                && Objects.equals(that.getNetworkCapabilities(), mNetworkCapabilities);

    }



    @Override

    public int hashCode() {

        return Objects.hash(mIpConfig, mNetworkCapabilities);

    }



    @Override

    public void writeToParcel(@NonNull Parcel dest, int flags) {

        mIpConfig.writeToParcel(dest, flags);

        mNetworkCapabilities.writeToParcel(dest, flags);

    }



    @Override

    public int describeContents() {

        return 0;

    }



    @NonNull

    public static final Parcelable.Creator<InternalNetworkUpdateRequest> CREATOR =

            new Parcelable.Creator<InternalNetworkUpdateRequest>() {

                @Override

                public InternalNetworkUpdateRequest[] newArray(int size) {

                    return new InternalNetworkUpdateRequest[size];

                }



                @Override

                public InternalNetworkUpdateRequest createFromParcel(@NonNull Parcel source) {

                    return new InternalNetworkUpdateRequest(source);

                }

            };

}