Merge "fix argument to CloseGuard.open()" am: 33b2163412 am: fc42b88845
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2379328 Change-Id: I9eab075a592cc6a20bb5631039c4c85bb41b8134 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
87c49db3b3
@@ -610,7 +610,7 @@ public class IpSecManager {
|
|||||||
} catch (RemoteException e) {
|
} catch (RemoteException e) {
|
||||||
throw e.rethrowFromSystemServer();
|
throw e.rethrowFromSystemServer();
|
||||||
}
|
}
|
||||||
mCloseGuard.open("constructor");
|
mCloseGuard.open("close");
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Get the encapsulation socket's file descriptor. */
|
/** Get the encapsulation socket's file descriptor. */
|
||||||
@@ -890,7 +890,7 @@ public class IpSecManager {
|
|||||||
} catch (RemoteException e) {
|
} catch (RemoteException e) {
|
||||||
throw e.rethrowFromSystemServer();
|
throw e.rethrowFromSystemServer();
|
||||||
}
|
}
|
||||||
mCloseGuard.open("constructor");
|
mCloseGuard.open("close");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user