| commit | 87c49db3b324ff909222309900e8fcf0ce444c25 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Sat Jan 07 10:52:28 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jan 07 10:52:28 2023 +0000 |
| tree | 49c8b7096703445dadd5a05a637819e7e935b0df | |
| parent | 9403e13e981bac5b0f445dbc6a9cc568e5708730 [diff] | |
| parent | fc42b8884533eab26458658aa3f285a75dcb1391 [diff] |
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>
diff --git a/framework-t/src/android/net/IpSecManager.java b/framework-t/src/android/net/IpSecManager.java index 1c83e09..ff021d6 100644 --- a/framework-t/src/android/net/IpSecManager.java +++ b/framework-t/src/android/net/IpSecManager.java
@@ -610,7 +610,7 @@ } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } - mCloseGuard.open("constructor"); + mCloseGuard.open("close"); } /** Get the encapsulation socket's file descriptor. */ @@ -890,7 +890,7 @@ } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } - mCloseGuard.open("constructor"); + mCloseGuard.open("close"); } /**