Give ChipDeviceController.java public method to release connected dev…

…ice pointer (#21769)
project-chip · Sep 14, 2023 · 1122040 · 1122040
1 parent f6a4f1c
commit 1122040
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/controller/java/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp
@@ -671,7 +671,7 @@ JNI_METHOD(void, getConnectedDevicePointer)(JNIEnv * env, jobject self, jlong ha
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Controller, "Error invoking GetConnectedDevice"));
 }
 
-JNI_METHOD(void, releaseConnectedDevicePointer)(JNIEnv * env, jobject self, jlong devicePtr)
+JNI_METHOD(void, releaseOperationalDevicePointer)(JNIEnv * env, jobject self, jlong devicePtr)
 {
     chip::DeviceLayer::StackLock lock;
     OperationalDeviceProxy * device = reinterpret_cast<OperationalDeviceProxy *>(devicePtr);

diff --git a/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java b/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java
@@ -258,6 +258,10 @@ public void getConnectedDevicePointer(long nodeId, GetConnectedDeviceCallback ca
     getConnectedDevicePointer(deviceControllerPtr, nodeId, jniCallback.getCallbackHandle());
   }
 
+  public void releaseConnectedDevicePointer(long devicePtr) {
+    releaseOperationalDevicePointer(devicePtr);
+  }
+
   public boolean disconnectDevice(long deviceId) {
     return disconnectDevice(deviceControllerPtr, deviceId);
   }
@@ -630,7 +634,7 @@ private native void commissionDevice(
   private native void getConnectedDevicePointer(
       long deviceControllerPtr, long deviceId, long callbackHandle);
 
-  private native void releaseConnectedDevicePointer(long devicePtr);
+  private native void releaseOperationalDevicePointer(long devicePtr);
 
   private native boolean disconnectDevice(long deviceControllerPtr, long deviceId);