Add shutdownCommissioning for commissioning step. (#17542)

Signed-off-by: sanghyukko <[email protected]> Signed-off-by: Charles Kim <[email protected]> Co-authored-by: sanghyukko <[email protected]>
project-chip · Jun 30, 2023 · 9690628 · 9690628
1 parent e895c65
commit 9690628
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/controller/java/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp
@@ -637,6 +637,17 @@ JNI_METHOD(jboolean, openPairingWindowWithPIN)
     return true;
 }
 
+JNI_METHOD(void, shutdownCommissioning)
+(JNIEnv * env, jobject self, jlong handle)
+{
+    chip::DeviceLayer::StackLock lock;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
+    err                                      = wrapper->Controller()->Shutdown();
+    VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Controller, "Error invoking shutdownCommissioning: %s", ErrorStr(err)));
+}
+
 JNI_METHOD(jbyteArray, getAttestationChallenge)
 (JNIEnv * env, jobject self, jlong handle, jlong devicePtr)
 {

diff --git a/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java b/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java
@@ -369,6 +369,10 @@ public PaseVerifierParams computePaseVerifier(
     return computePaseVerifier(deviceControllerPtr, devicePtr, setupPincode, iterations, salt);
   }
 
+  public void shutdownCommissioning() {
+    shutdownCommissioning(deviceControllerPtr);
+  }
+
   private native PaseVerifierParams computePaseVerifier(
       long deviceControllerPtr, long devicePtr, long setupPincode, long iterations, byte[] salt);
 
@@ -452,6 +456,8 @@ private native boolean openPairingWindowWithPIN(
 
   private native void shutdownSubscriptions(long deviceControllerPtr, long devicePtr);
 
+  private native void shutdownCommissioning(long deviceControllerPtr);
+
   static {
     System.loadLibrary("CHIPController");
   }