LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Rename create/delete transform methods" am: da6956a702 am: 5b71c4a0a5

Browse Source 
am: f5aae7f1a3

Change-Id: Ie07b0b608b3dfcbfc4228a15e26fe6f6559315f9
This commit is contained in:
Benedict Wong
2018-01-22 20:03:48 +00:00
committed by android-build-merger
parent d5059166ac f5aae7f1a3
commit f9040dea3b
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/net/IIpSecService.aidl
View File

@@ -39,9 +39,9 @@ interface IIpSecService
void closeUdpEncapsulationSocket(int resourceId); void closeUdpEncapsulationSocket(int resourceId);
IpSecTransformResponse createTransportModeTransform(in IpSecConfig c, in IBinder binder); IpSecTransformResponse createTransform(in IpSecConfig c, in IBinder binder);
void deleteTransportModeTransform(int transformId); void deleteTransform(int transformId);
void applyTransportModeTransform(in ParcelFileDescriptor socket, int direction, int transformId); void applyTransportModeTransform(in ParcelFileDescriptor socket, int direction, int transformId);

5
core/java/android/net/IpSecTransform.java
View File

@@ -124,8 +124,7 @@ public final class IpSecTransform implements AutoCloseable {
synchronized (this) { synchronized (this) {
try { try {
IIpSecService svc = getIpSecService(); IIpSecService svc = getIpSecService();
IpSecTransformResponse result = IpSecTransformResponse result = svc.createTransform(mConfig, new Binder());
svc.createTransportModeTransform(mConfig, new Binder());
int status = result.status; int status = result.status;
checkResultStatus(status); checkResultStatus(status);
mResourceId = result.resourceId; mResourceId = result.resourceId;
@@ -170,7 +169,7 @@ public final class IpSecTransform implements AutoCloseable {
* still want to clear out the transform. * still want to clear out the transform.
*/ */
IIpSecService svc = getIpSecService(); IIpSecService svc = getIpSecService();
svc.deleteTransportModeTransform(mResourceId); svc.deleteTransform(mResourceId);
stopKeepalive(); stopKeepalive();
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowAsRuntimeException(); throw e.rethrowAsRuntimeException();

8
services/core/java/com/android/server/IpSecService.java
View File

@@ -1105,10 +1105,10 @@ public class IpSecService extends IIpSecService.Stub {
* receive data. * receive data.
*/ */
@Override @Override
public synchronized IpSecTransformResponse createTransportModeTransform( public synchronized IpSecTransformResponse createTransform(IpSecConfig c, IBinder binder)
IpSecConfig c, IBinder binder) throws RemoteException { throws RemoteException {
checkIpSecConfig(c); checkIpSecConfig(c);
checkNotNull(binder, "Null Binder passed to createTransportModeTransform"); checkNotNull(binder, "Null Binder passed to createTransform");
final int resourceId = mNextResourceId++; final int resourceId = mNextResourceId++;
UserRecord userRecord = mUserResourceTracker.getUserRecord(Binder.getCallingUid()); UserRecord userRecord = mUserResourceTracker.getUserRecord(Binder.getCallingUid());
@@ -1186,7 +1186,7 @@ public class IpSecService extends IIpSecService.Stub {
* other reasons. * other reasons.
*/ */
@Override @Override
public synchronized void deleteTransportModeTransform(int resourceId) throws RemoteException { public synchronized void deleteTransform(int resourceId) throws RemoteException {
UserRecord userRecord = mUserResourceTracker.getUserRecord(Binder.getCallingUid()); UserRecord userRecord = mUserResourceTracker.getUserRecord(Binder.getCallingUid());
releaseResource(userRecord.mTransformRecords, resourceId); releaseResource(userRecord.mTransformRecords, resourceId);
} }