From da6eae522e3edce0b67427a3303d1259690d3098 Mon Sep 17 00:00:00 2001 From: Joonhaeng Heo Date: Tue, 22 Aug 2023 10:36:33 +0900 Subject: [PATCH 1/2] Add controller node ID API --- src/controller/java/CHIPDeviceController-JNI.cpp | 9 +++++++++ .../src/chip/devicecontroller/ChipDeviceController.java | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/src/controller/java/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp index be7bfa6b28008f..d4c0dd93bfc7c9 100644 --- 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 index 33cb7a9ff3ae6e..b8e12e2e9b7b59 100644 --- a/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java +++ b/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java @@ -468,6 +468,13 @@ 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 +1168,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); From 3dd8b98b5d428fce653c90b792683eacb311bcb6 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Tue, 22 Aug 2023 01:44:57 +0000 Subject: [PATCH 2/2] Restyled by google-java-format --- .../java/src/chip/devicecontroller/ChipDeviceController.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java b/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java index b8e12e2e9b7b59..d6385523879998 100644 --- a/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java +++ b/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java @@ -468,9 +468,7 @@ public long getCompressedFabricId() { return getCompressedFabricId(deviceControllerPtr); } - /** - * Get device Controller's Node ID. - */ + /** Get device Controller's Node ID. */ public long getControllerNodeId() { return getControllerNodeId(deviceControllerPtr); }