joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
am: 5b71c4a0a5

Change-Id: I16bfb511ac2d6094e246f79d51fe4520d3e765cd
This commit is contained in:
Benedict Wong 2018-01-22 19:53:15 +00:00 • committed by android-build-merger
commit f5aae7f1a3
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);
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);

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

@ -124,8 +124,7 @@ public final class IpSecTransform implements AutoCloseable {
synchronized (this) {
try {
IIpSecService svc = getIpSecService();
IpSecTransformResponse result =
svc.createTransportModeTransform(mConfig, new Binder());
IpSecTransformResponse result = svc.createTransform(mConfig, new Binder());
int status = result.status;
checkResultStatus(status);
mResourceId = result.resourceId;
@ -170,7 +169,7 @@ public final class IpSecTransform implements AutoCloseable {
* still want to clear out the transform.
*/
IIpSecService svc = getIpSecService();
svc.deleteTransportModeTransform(mResourceId);
svc.deleteTransform(mResourceId);
stopKeepalive();
} catch (RemoteException e) {
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.
*/
@Override
public synchronized IpSecTransformResponse createTransportModeTransform(
IpSecConfig c, IBinder binder) throws RemoteException {
public synchronized IpSecTransformResponse createTransform(IpSecConfig c, IBinder binder)
throws RemoteException {
checkIpSecConfig(c);
checkNotNull(binder, "Null Binder passed to createTransportModeTransform");
checkNotNull(binder, "Null Binder passed to createTransform");
final int resourceId = mNextResourceId++;
UserRecord userRecord = mUserResourceTracker.getUserRecord(Binder.getCallingUid());
@ -1186,7 +1186,7 @@ public class IpSecService extends IIpSecService.Stub {
* other reasons.
*/
@Override
public synchronized void deleteTransportModeTransform(int resourceId) throws RemoteException {
public synchronized void deleteTransform(int resourceId) throws RemoteException {
UserRecord userRecord = mUserResourceTracker.getUserRecord(Binder.getCallingUid());
releaseResource(userRecord.mTransformRecords, resourceId);
}