From b24f3da2b95d9543bc268e266fde714134f67f97 Mon Sep 17 00:00:00 2001 From: Aaron Huang Date: Mon, 6 Dec 2021 15:18:42 +0800 Subject: [PATCH] Fix style errors for IpSec associated files Bug: 204153604 Test: build pass. Change-Id: I940de8bef7f693dcce8808148a975bea1f36712c --- .../src/android/net/IpSecAlgorithm.java | 2 +- framework-t/src/android/net/IpSecManager.java | 12 +++---- .../android/net/IpSecTransformResponse.java | 3 +- .../net/IpSecTunnelInterfaceResponse.java | 3 +- .../android/net/IpSecUdpEncapResponse.java | 4 ++- .../src/com/android/server/IpSecService.java | 33 ++++++++++--------- 6 files changed, 31 insertions(+), 26 deletions(-) diff --git a/framework-t/src/android/net/IpSecAlgorithm.java b/framework-t/src/android/net/IpSecAlgorithm.java index 86052484ea..840af28b77 100644 --- a/framework-t/src/android/net/IpSecAlgorithm.java +++ b/framework-t/src/android/net/IpSecAlgorithm.java @@ -297,7 +297,7 @@ public final class IpSecAlgorithm implements Parcelable { return mTruncLenBits; } - /* Parcelable Implementation */ + /** Parcelable Implementation */ public int describeContents() { return 0; } diff --git a/framework-t/src/android/net/IpSecManager.java b/framework-t/src/android/net/IpSecManager.java index c10680761f..837629911c 100644 --- a/framework-t/src/android/net/IpSecManager.java +++ b/framework-t/src/android/net/IpSecManager.java @@ -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 diff --git a/framework-t/src/android/net/IpSecTransformResponse.java b/framework-t/src/android/net/IpSecTransformResponse.java index a38488954f..363f3165ee 100644 --- a/framework-t/src/android/net/IpSecTransformResponse.java +++ b/framework-t/src/android/net/IpSecTransformResponse.java @@ -60,7 +60,8 @@ public final class IpSecTransformResponse implements Parcelable { resourceId = in.readInt(); } - public static final @android.annotation.NonNull Parcelable.Creator CREATOR = + @android.annotation.NonNull + public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { public IpSecTransformResponse createFromParcel(Parcel in) { return new IpSecTransformResponse(in); diff --git a/framework-t/src/android/net/IpSecTunnelInterfaceResponse.java b/framework-t/src/android/net/IpSecTunnelInterfaceResponse.java index e3411e003d..127e30a693 100644 --- a/framework-t/src/android/net/IpSecTunnelInterfaceResponse.java +++ b/framework-t/src/android/net/IpSecTunnelInterfaceResponse.java @@ -65,7 +65,8 @@ public final class IpSecTunnelInterfaceResponse implements Parcelable { interfaceName = in.readString(); } - public static final @android.annotation.NonNull Parcelable.Creator CREATOR = + @android.annotation.NonNull + public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { public IpSecTunnelInterfaceResponse createFromParcel(Parcel in) { return new IpSecTunnelInterfaceResponse(in); diff --git a/framework-t/src/android/net/IpSecUdpEncapResponse.java b/framework-t/src/android/net/IpSecUdpEncapResponse.java index 4e7ba9b515..732cf198a9 100644 --- a/framework-t/src/android/net/IpSecUdpEncapResponse.java +++ b/framework-t/src/android/net/IpSecUdpEncapResponse.java @@ -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 CREATOR = + @android.annotation.NonNull + public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { public IpSecUdpEncapResponse createFromParcel(Parcel in) { return new IpSecUdpEncapResponse(in); diff --git a/service-t/src/com/android/server/IpSecService.java b/service-t/src/com/android/server/IpSecService.java index aeb814327e..dfc57c136f 100644 --- a/service-t/src/com/android/server/IpSecService.java +++ b/service-t/src/com/android/server/IpSecService.java @@ -132,7 +132,7 @@ public class IpSecService extends IIpSecService.Stub { interface IpSecServiceConfiguration { INetd getNetdInstance() throws RemoteException; - static IpSecServiceConfiguration GETSRVINSTANCE = + IpSecServiceConfiguration GETSRVINSTANCE = new IpSecServiceConfiguration() { @Override public INetd getNetdInstance() throws RemoteException { @@ -491,8 +491,8 @@ public class IpSecService extends IIpSecService.Stub { *

This class associates kernel resources with the UID that owns and controls them. */ private abstract class OwnedResourceRecord implements IResource { - final int pid; - final int uid; + final int mPid; + final int mUid; protected final int mResourceId; OwnedResourceRecord(int resourceId) { @@ -501,8 +501,8 @@ public class IpSecService extends IIpSecService.Stub { throw new IllegalArgumentException("Resource ID must not be INVALID_RESOURCE_ID"); } mResourceId = resourceId; - pid = Binder.getCallingPid(); - uid = Binder.getCallingUid(); + mPid = Binder.getCallingPid(); + mUid = Binder.getCallingUid(); getResourceTracker().take(); } @@ -512,7 +512,7 @@ public class IpSecService extends IIpSecService.Stub { /** Convenience method; retrieves the user resource record for the stored UID. */ protected UserRecord getUserRecord() { - return mUserResourceTracker.getUserRecord(uid); + return mUserResourceTracker.getUserRecord(mUid); } @Override @@ -527,9 +527,9 @@ public class IpSecService extends IIpSecService.Stub { .append("{mResourceId=") .append(mResourceId) .append(", pid=") - .append(pid) + .append(mPid) .append(", uid=") - .append(uid) + .append(mUid) .append("}") .toString(); } @@ -545,7 +545,7 @@ public class IpSecService extends IIpSecService.Stub { SparseArray> mArray = new SparseArray<>(); private final String mTypeName; - public RefcountedResourceArray(String typeName) { + RefcountedResourceArray(String typeName) { this.mTypeName = typeName; } @@ -628,7 +628,7 @@ public class IpSecService extends IIpSecService.Stub { mSrvConfig .getNetdInstance() .ipSecDeleteSecurityAssociation( - uid, + mUid, mConfig.getSourceAddress(), mConfig.getDestinationAddress(), spi, @@ -696,7 +696,7 @@ public class IpSecService extends IIpSecService.Stub { mSrvConfig .getNetdInstance() .ipSecDeleteSecurityAssociation( - uid, mSourceAddress, mDestinationAddress, mSpi, 0 /* mark */, + mUid, mSourceAddress, mDestinationAddress, mSpi, 0 /* mark */, 0 /* mask */, 0 /* if_id */); } } catch (ServiceSpecificException | RemoteException e) { @@ -849,14 +849,14 @@ public class IpSecService extends IIpSecService.Stub { for (int selAddrFamily : ADDRESS_FAMILIES) { netd.ipSecDeleteSecurityPolicy( - uid, + mUid, selAddrFamily, IpSecManager.DIRECTION_OUT, mOkey, 0xffffffff, mIfId); netd.ipSecDeleteSecurityPolicy( - uid, + mUid, selAddrFamily, IpSecManager.DIRECTION_IN, mIkey, @@ -1025,7 +1025,7 @@ public class IpSecService extends IIpSecService.Stub { @NonNull private AppOpsManager getAppOpsManager() { AppOpsManager appOps = (AppOpsManager) mContext.getSystemService(Context.APP_OPS_SERVICE); - if(appOps == null) throw new RuntimeException("System Server couldn't get AppOps"); + if (appOps == null) throw new RuntimeException("System Server couldn't get AppOps"); return appOps; } @@ -1054,6 +1054,7 @@ public class IpSecService extends IIpSecService.Stub { mUidFdTagger = uidFdTagger; } + /** Called by system server when system is ready. */ public void systemReady() { if (isNetdAlive()) { Log.d(TAG, "IpSecService is ready"); @@ -1229,7 +1230,7 @@ public class IpSecService extends IIpSecService.Stub { *

Since the socket is created on behalf of an unprivileged application, all traffic * should be accounted to the UID of the unprivileged application. */ - public void tag(FileDescriptor fd, int uid) throws IOException; + void tag(FileDescriptor fd, int uid) throws IOException; } /** @@ -1771,7 +1772,7 @@ public class IpSecService extends IIpSecService.Stub { TransformRecord info = userRecord.mTransformRecords.getResourceOrThrow(resourceId); // TODO: make this a function. - if (info.pid != getCallingPid() || info.uid != callingUid) { + if (info.mPid != getCallingPid() || info.mUid != callingUid) { throw new SecurityException("Only the owner of an IpSec Transform may apply it!"); }