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

Commit 9dfef0cf authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix style errors for IpSec associated files" am: 58863696 

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

Change-Id: I3fc9ca679e22da5d5da1ff2fc1856a5518f02b69
parents 252d8842 58863696

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

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ public final class IpSecAlgorithm implements Parcelable { 
        return mTruncLenBits;

    }



    /* Parcelable Implementation */

    /** Parcelable Implementation */

    public int describeContents() {

        return 0;

    }

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

+6 −6
Original line number Diff line number Diff line
@@ -99,9 +99,9 @@ public final class IpSecManager { 


    /** @hide */

    public interface Status {

        public static final int OK = 0;

        public static final int RESOURCE_UNAVAILABLE = 1;

        public static final int SPI_UNAVAILABLE = 2;

        int OK = 0;

        int RESOURCE_UNAVAILABLE = 1;

        int SPI_UNAVAILABLE = 2;

    }



    /** @hide */
@@ -276,7 +276,7 @@ public final class IpSecManager { 
     * @param destinationAddress the destination address for traffic bearing the requested SPI.

     *     For inbound traffic, the destination should be an address currently assigned on-device.

     * @return the reserved SecurityParameterIndex

     * @throws {@link #ResourceUnavailableException} indicating that too many SPIs are

     * @throws ResourceUnavailableException indicating that too many SPIs are

     *     currently allocated for this user

     */

    @NonNull
@@ -307,9 +307,9 @@ public final class IpSecManager { 
     * @param requestedSpi the requested SPI. The range 1-255 is reserved and may not be used. See

     *     RFC 4303 Section 2.1.

     * @return the reserved SecurityParameterIndex

     * @throws {@link #ResourceUnavailableException} indicating that too many SPIs are

     * @throws ResourceUnavailableException indicating that too many SPIs are

     *     currently allocated for this user

     * @throws {@link #SpiUnavailableException} indicating that the requested SPI could not be

     * @throws SpiUnavailableException indicating that the requested SPI could not be

     *     reserved

     */

    @NonNull

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

+2 −1
Original line number Diff line number Diff line
@@ -60,7 +60,8 @@ public final class IpSecTransformResponse implements Parcelable { 
        resourceId = in.readInt();

    }



    public static final @android.annotation.NonNull Parcelable.Creator<IpSecTransformResponse> CREATOR =

    @android.annotation.NonNull

    public static final Parcelable.Creator<IpSecTransformResponse> CREATOR =

            new Parcelable.Creator<IpSecTransformResponse>() {

                public IpSecTransformResponse createFromParcel(Parcel in) {

                    return new IpSecTransformResponse(in);

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

+2 −1
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ public final class IpSecTunnelInterfaceResponse implements Parcelable { 
        interfaceName = in.readString();

    }



    public static final @android.annotation.NonNull Parcelable.Creator<IpSecTunnelInterfaceResponse> CREATOR =

    @android.annotation.NonNull

    public static final Parcelable.Creator<IpSecTunnelInterfaceResponse> CREATOR =

            new Parcelable.Creator<IpSecTunnelInterfaceResponse>() {

                public IpSecTunnelInterfaceResponse createFromParcel(Parcel in) {

                    return new IpSecTunnelInterfaceResponse(in);

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

+3 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.net; 
import android.os.Parcel;

import android.os.ParcelFileDescriptor;

import android.os.Parcelable;



import java.io.FileDescriptor;

import java.io.IOException;
@@ -83,7 +84,8 @@ public final class IpSecUdpEncapResponse implements Parcelable { 
        fileDescriptor = in.readParcelable(ParcelFileDescriptor.class.getClassLoader());

    }



    public static final @android.annotation.NonNull Parcelable.Creator<IpSecUdpEncapResponse> CREATOR =

    @android.annotation.NonNull

    public static final Parcelable.Creator<IpSecUdpEncapResponse> CREATOR =

            new Parcelable.Creator<IpSecUdpEncapResponse>() {

                public IpSecUdpEncapResponse createFromParcel(Parcel in) {

                    return new IpSecUdpEncapResponse(in);