[Android] Add controller node ID API (project-chip#28791)

* Add controller node ID API * Restyled by google-java-format --------- Co-authored-by: Restyled.io <commits@restyled.io>
abpoth · Aug 25, 2023 · c706af4 · c706af4
1 parent f19d557
commit c706af4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/controller/java/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp
@@ -1405,6 +1405,15 @@ JNI_METHOD(jlong, getCompressedFabricId)(JNIEnv * env, jobject self, jlong handl
     return wrapper->Controller()->GetCompressedFabricId();
 }
 
+JNI_METHOD(jlong, getControllerNodeId)(JNIEnv * env, jobject self, jlong handle)
+{
+    chip::DeviceLayer::StackLock lock;
+
+    AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
+
+    return wrapper->Controller()->GetNodeId();
+}
+
 JNI_METHOD(void, discoverCommissionableNodes)(JNIEnv * env, jobject self, jlong handle)
 {
     chip::DeviceLayer::StackLock lock;

diff --git a/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java b/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java
@@ -468,6 +468,11 @@ public long getCompressedFabricId() {
     return getCompressedFabricId(deviceControllerPtr);
   }
 
+  /** Get device Controller's Node ID. */
+  public long getControllerNodeId() {
+    return getControllerNodeId(deviceControllerPtr);
+  }
+
   /**
    * Returns the compressed fabric ID based on the given root certificate and node operational
    * credentials.
@@ -1161,6 +1166,8 @@ private native void getConnectedDevicePointer(
 
   private native long getCompressedFabricId(long deviceControllerPtr);
 
+  private native long getControllerNodeId(long deviceControllerPtr);
+
   private native void discoverCommissionableNodes(long deviceControllerPtr);
 
   private native DiscoveredDevice getDiscoveredDevice(long deviceControllerPtr, int idx);