| commit | fc42b8884533eab26458658aa3f285a75dcb1391 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Sat Jan 07 10:23:01 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jan 07 10:23:01 2023 +0000 |
| tree | ae248647921483f648a3f8f27256bde1874e2398 | |
| parent | 645d524fba8498e89b0a1b3b8fa92685acc2fee7 [diff] | |
| parent | 33b21634128da56fdf1c507bc1a860f5e3d29970 [diff] |
Merge "fix argument to CloseGuard.open()" am: 33b2163412 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2379328 Change-Id: Ib6f11fce81563dcf2c2a8775d8a727c6a06fcb99 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"); } /**