Merge "fix argument to CloseGuard.open()" am: c95f0d8abf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2379468 Change-Id: I9528f201827673d8d0899aece1d19da415c11d5f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
committed by
Automerger Merge Worker
commit
4268348a59
@@ -273,7 +273,7 @@ public class IpSecManager {
|
|||||||
} catch (RemoteException e) {
|
} catch (RemoteException e) {
|
||||||
throw e.rethrowFromSystemServer();
|
throw e.rethrowFromSystemServer();
|
||||||
}
|
}
|
||||||
mCloseGuard.open("open");
|
mCloseGuard.open("close");
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @hide */
|
/** @hide */
|
||||||
|
|||||||
@@ -126,7 +126,7 @@ public final class IpSecTransform implements AutoCloseable {
|
|||||||
checkResultStatus(status);
|
checkResultStatus(status);
|
||||||
mResourceId = result.resourceId;
|
mResourceId = result.resourceId;
|
||||||
Log.d(TAG, "Added Transform with Id " + mResourceId);
|
Log.d(TAG, "Added Transform with Id " + mResourceId);
|
||||||
mCloseGuard.open("build");
|
mCloseGuard.open("close");
|
||||||
} catch (ServiceSpecificException e) {
|
} catch (ServiceSpecificException e) {
|
||||||
throw IpSecManager.rethrowUncheckedExceptionFromServiceSpecificException(e);
|
throw IpSecManager.rethrowUncheckedExceptionFromServiceSpecificException(e);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user