From 151994c22f8650633ec95b878e9971a1b884436e Mon Sep 17 00:00:00 2001
From: Mathieu Kardous <mathieu.kardous@silabs.com>
Date: Tue, 18 Jun 2024 09:59:22 -0400
Subject: [PATCH] Add missing setter call

---
 .../java/AndroidDeviceControllerWrapper.cpp          |  1 +
 .../src/chip/devicecontroller/ICDDeviceInfo.java     | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/controller/java/AndroidDeviceControllerWrapper.cpp b/src/controller/java/AndroidDeviceControllerWrapper.cpp
index 085b9c2ff34b70..32a595e3c9067c 100644
--- a/src/controller/java/AndroidDeviceControllerWrapper.cpp
+++ b/src/controller/java/AndroidDeviceControllerWrapper.cpp
@@ -568,6 +568,7 @@ CHIP_ERROR AndroidDeviceControllerWrapper::ApplyICDRegistrationInfo(chip::Contro
         clientType = static_cast<chip::app::Clusters::IcdManagement::ClientTypeEnum>(
             chip::JniReferences::GetInstance().ShortToPrimitive(jClientType));
     }
+    params.SetICDClientType(clientType);
 
     return err;
 }
diff --git a/src/controller/java/src/chip/devicecontroller/ICDDeviceInfo.java b/src/controller/java/src/chip/devicecontroller/ICDDeviceInfo.java
index 70cbeb61cff5f4..2171c2a1639dcc 100644
--- a/src/controller/java/src/chip/devicecontroller/ICDDeviceInfo.java
+++ b/src/controller/java/src/chip/devicecontroller/ICDDeviceInfo.java
@@ -62,6 +62,7 @@ public int getBitIndex() {
   private final long icdNodeId;
   private final long icdCounter;
   private final long monitoredSubject;
+  private final Short clientType;
   private final long fabricId;
   private final int fabricIndex;
 
@@ -75,6 +76,7 @@ public int getBitIndex() {
       long icdNodeId,
       long icdCounter,
       long monitoredSubject,
+      Short clientType,
       long fabricId,
       int fabricIndex) {
     this.symmetricKey = symmetricKey;
@@ -86,6 +88,7 @@ public int getBitIndex() {
     this.icdNodeId = icdNodeId;
     this.icdCounter = icdCounter;
     this.monitoredSubject = monitoredSubject;
+    this.clientType = clientType;
     this.fabricId = fabricId;
     this.fabricIndex = fabricIndex;
   }
@@ -100,6 +103,7 @@ public int getBitIndex() {
       long icdNodeId,
       long icdCounter,
       long monitoredSubject,
+      Short clientType,
       long fabricId,
       int fabricIndex) {
     this.symmetricKey = symmetricKey;
@@ -110,6 +114,7 @@ public int getBitIndex() {
     this.icdNodeId = icdNodeId;
     this.icdCounter = icdCounter;
     this.monitoredSubject = monitoredSubject;
+    this.clientType = clientType;
     this.fabricId = fabricId;
     this.fabricIndex = fabricIndex;
 
@@ -167,6 +172,11 @@ public long getMonitoredSubject() {
     return monitoredSubject;
   }
 
+  /** Returns the ClientType. */
+  public Short getClientType() {
+    return clientType
+  }
+
   /** Returns the Fabric Id */
   public long getFabricId() {
     return fabricId;
@@ -190,6 +200,8 @@ public String toString() {
         + icdCounter
         + "\n\tmonitoredSubject : "
         + monitoredSubject
+        + "\n clientType : "
+        + clientType
         + "\n\tfabricId : "
         + fabricId
         + "\n\tfabricIndex : "