commit c95f0d8abf388ea08c1f8aa857372fdb17b83bab
author Maciej Żenczykowski <maze@google.com> Fri Jan 13 12:12:20 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 13 12:12:20 2023 +0000
tree 3d622f21b08e78224712a572a8a8f9bd3d5dba06
parent 8043d5d7af7435c4461074343b0c6823244edf20
parent 401122894d9989227103bd19e9617553e3a18d7b

Merge "fix argument to CloseGuard.open()"

framework-t/src/android/net/IpSecManager.java

diff --git a/framework-t/src/android/net/IpSecManager.java b/framework-t/src/android/net/IpSecManager.java
index c8469b1..3afa6ef 100644
--- a/framework-t/src/android/net/IpSecManager.java
+++ b/framework-t/src/android/net/IpSecManager.java
@@ -273,7 +273,7 @@
             } catch (RemoteException e) {
                 throw e.rethrowFromSystemServer();
             }
-            mCloseGuard.open("open");
+            mCloseGuard.open("close");
         }
 
         /** @hide */

framework-t/src/android/net/IpSecTransform.java

diff --git a/framework-t/src/android/net/IpSecTransform.java b/framework-t/src/android/net/IpSecTransform.java
index 68ae5de..c236b6c 100644
--- a/framework-t/src/android/net/IpSecTransform.java
+++ b/framework-t/src/android/net/IpSecTransform.java
@@ -126,7 +126,7 @@
                 checkResultStatus(status);
                 mResourceId = result.resourceId;
                 Log.d(TAG, "Added Transform with Id " + mResourceId);
-                mCloseGuard.open("build");
+                mCloseGuard.open("close");
             } catch (ServiceSpecificException e) {
                 throw IpSecManager.rethrowUncheckedExceptionFromServiceSpecificException(e);
             }