From 1ef9f8cba1143887057050f75d374381a4fe838c Mon Sep 17 00:00:00 2001
From: joonhaengHeo <85541460+joonhaengHeo@users.noreply.github.com>
Date: Wed, 6 Dec 2023 00:30:15 +0900
Subject: [PATCH] [Android] Implement OTA Provider exception case (#30777)

* Implement Android OTA Provider exception case

* Restyled by google-java-format

* Restyled by clang-format

* Add TooManyFunctions exception

---------

Co-authored-by: Restyled.io <commits@restyled.io>
---
 .../OtaProviderClientFragment.kt              | 395 +++++++++++++++++-
 .../res/layout/add_access_control_dialog.xml  |  17 +-
 .../layout/ota_provider_client_fragment.xml   | 158 ++++++-
 .../write_default_otaproviders_dialog.xml     |  60 +++
 .../app/src/main/res/values/strings.xml       |  15 +
 kotlin-detect-config.yaml                     |   1 +
 .../java/OTAProviderDelegateBridge.cpp        |  69 ++-
 .../devicecontroller/OTAProviderDelegate.java |  53 ++-
 8 files changed, 726 insertions(+), 42 deletions(-)
 create mode 100644 examples/android/CHIPTool/app/src/main/res/layout/write_default_otaproviders_dialog.xml

diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OtaProviderClientFragment.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OtaProviderClientFragment.kt
index da7d6791372195..87735856fa4844 100644
--- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OtaProviderClientFragment.kt
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OtaProviderClientFragment.kt
@@ -1,6 +1,7 @@
 package com.google.chip.chiptool.clusterclient
 
 import android.app.Activity
+import android.app.AlertDialog
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
@@ -9,22 +10,42 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.Button
+import android.widget.EditText
+import android.widget.Spinner
+import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import chip.devicecontroller.ChipClusters
 import chip.devicecontroller.ChipClusters.DefaultClusterCallback
 import chip.devicecontroller.ChipDeviceController
+import chip.devicecontroller.ClusterIDMapping
 import chip.devicecontroller.OTAProviderDelegate
+import chip.devicecontroller.OTAProviderDelegate.QueryImageResponseStatusEnum
+import chip.devicecontroller.ReportCallback
+import chip.devicecontroller.WriteAttributesCallback
+import chip.devicecontroller.cluster.structs.AccessControlClusterAccessControlEntryStruct
+import chip.devicecontroller.cluster.structs.OtaSoftwareUpdateRequestorClusterProviderLocation
+import chip.devicecontroller.model.AttributeWriteRequest
+import chip.devicecontroller.model.ChipAttributePath
+import chip.devicecontroller.model.ChipEventPath
+import chip.devicecontroller.model.NodeState
 import com.google.chip.chiptool.ChipClient
 import com.google.chip.chiptool.GenericChipDeviceListener
 import com.google.chip.chiptool.R
 import com.google.chip.chiptool.databinding.OtaProviderClientFragmentBinding
+import com.google.chip.chiptool.util.toAny
 import java.io.BufferedInputStream
 import java.io.IOException
 import java.io.InputStream
 import java.util.Optional
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import matter.tlv.AnonymousTag
+import matter.tlv.TlvReader
+import matter.tlv.TlvWriter
 
 class OtaProviderClientFragment : Fragment() {
   private val deviceController: ChipDeviceController
@@ -45,6 +66,8 @@ class OtaProviderClientFragment : Fragment() {
   private val binding
     get() = _binding!!
 
+  private val attributeList = ClusterIDMapping.OtaSoftwareUpdateRequestor.Attribute.values()
+
   override fun onCreateView(
     inflater: LayoutInflater,
     container: ViewGroup?,
@@ -59,16 +82,312 @@ class OtaProviderClientFragment : Fragment() {
       childFragmentManager.findFragmentById(R.id.addressUpdateFragment) as AddressUpdateFragment
 
     binding.selectFirmwareFileBtn.setOnClickListener { selectFirmwareFileBtnClick() }
+    binding.updateOTAStatusBtn.setOnClickListener { updateOTAStatusBtnClick() }
     binding.announceOTAProviderBtn.setOnClickListener {
       scope.launch { sendAnnounceOTAProviderBtnClick() }
     }
 
+    binding.writeAclBtn.setOnClickListener { scope.launch { sendAclBtnClick() } }
+
+    binding.readAttributeBtn.setOnClickListener { scope.launch { readAttributeBtnClick() } }
+
+    binding.writeAttributeBtn.setOnClickListener { scope.launch { writeAttributeBtnClick() } }
+
+    setQueryImageSpinnerListener()
+
+    val attributeNames = attributeList.map { it.name }
+
+    binding.attributeSp.adapter =
+      ArrayAdapter(requireContext(), android.R.layout.simple_spinner_dropdown_item, attributeNames)
+
     binding.vendorIdEd.setText(ChipClient.VENDOR_ID.toString())
+    binding.delayActionTimeEd.setText("0")
 
     deviceController.startOTAProvider(otaProviderCallback)
     return binding.root
   }
 
+  private suspend fun sendAclBtnClick() {
+    val endpointId = 0
+    val clusterId = ClusterIDMapping.AccessControl.ID
+    val attributeId = ClusterIDMapping.AccessControl.Attribute.Acl.id
+
+    val attributePath = ChipAttributePath.newInstance(endpointId, clusterId, attributeId)
+    deviceController.readAttributePath(
+      object : ReportCallback {
+        override fun onError(
+          attributePath: ChipAttributePath?,
+          eventPath: ChipEventPath?,
+          e: Exception
+        ) {
+          Log.d(TAG, "onError : ", e)
+          showMessage("Error : $e")
+        }
+
+        override fun onReport(nodeState: NodeState?) {
+          Log.d(TAG, "onResponse")
+          val tlv =
+            nodeState
+              ?.getEndpointState(endpointId)
+              ?.getClusterState(clusterId)
+              ?.getAttributeState(attributeId)
+              ?.tlv
+          requireActivity().runOnUiThread { showAddAccessControlDialog(tlv) }
+        }
+      },
+      ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId),
+      listOf(attributePath),
+      0
+    )
+  }
+
+  private fun showAddAccessControlDialog(tlv: ByteArray?) {
+    if (tlv == null) {
+      Log.d(TAG, "Access Control read fail")
+      showMessage("Access Control read fail")
+      return
+    }
+
+    val dialogView =
+      requireActivity().layoutInflater.inflate(R.layout.add_access_control_dialog, null)
+    val groupIdEd = dialogView.findViewById<EditText>(R.id.groupIdEd)
+    groupIdEd.visibility = View.GONE
+    val nodeIdEd = dialogView.findViewById<EditText>(R.id.nodeIdEd)
+    nodeIdEd.visibility = View.VISIBLE
+    val accessControlEntrySp = dialogView.findViewById<Spinner>(R.id.accessControlEntrySp)
+    accessControlEntrySp.adapter =
+      ArrayAdapter(
+        requireContext(),
+        android.R.layout.simple_spinner_dropdown_item,
+        GroupSettingFragment.Companion.AccessControlEntry.values()
+      )
+
+    val dialog = AlertDialog.Builder(requireContext()).apply { setView(dialogView) }.create()
+    dialogView.findViewById<Button>(R.id.addAccessControlBtn).setOnClickListener {
+      scope.launch {
+        sendAccessControl(
+          tlv,
+          nodeIdEd.text.toString().toULong(),
+          GroupSettingFragment.Companion.AccessControlEntry.valueOf(
+              accessControlEntrySp.selectedItem.toString()
+            )
+            .id
+        )
+        requireActivity().runOnUiThread { dialog.dismiss() }
+      }
+    }
+    dialog.show()
+  }
+
+  private suspend fun sendAccessControl(tlv: ByteArray, nodeId: ULong, privilege: UInt) {
+    val tlvWriter = TlvWriter().startArray(AnonymousTag)
+    var entryStructList: List<AccessControlClusterAccessControlEntryStruct>
+    TlvReader(tlv).also {
+      entryStructList = buildList {
+        it.enterArray(AnonymousTag)
+        while (!it.isEndOfContainer()) {
+          add(AccessControlClusterAccessControlEntryStruct.fromTlv(AnonymousTag, it))
+        }
+        it.exitContainer()
+      }
+    }
+
+    // If GroupID is already added to AccessControl, do not add it.
+    for (entry in entryStructList) {
+      if (
+        entry.authMode == 2U /* CASE */ &&
+          entry.subjects != null &&
+          entry.subjects!!.contains(nodeId)
+      ) {
+        continue
+      }
+
+      entry.toTlv(AnonymousTag, tlvWriter)
+    }
+
+    val newEntry =
+      AccessControlClusterAccessControlEntryStruct(
+        privilege,
+        2U /* CASE */,
+        listOf(nodeId),
+        null,
+        deviceController.fabricIndex.toUInt()
+      )
+    newEntry.toTlv(AnonymousTag, tlvWriter)
+    tlvWriter.endArray()
+
+    deviceController.write(
+      object : WriteAttributesCallback {
+        override fun onError(attributePath: ChipAttributePath?, e: Exception?) {
+          Log.d(TAG, "onError : ", e)
+          showMessage("Error : ${e.toString()}")
+        }
+
+        override fun onResponse(attributePath: ChipAttributePath?) {
+          Log.d(TAG, "onResponse")
+          showMessage("write Success")
+        }
+      },
+      ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId),
+      listOf(
+        AttributeWriteRequest.newInstance(
+          0,
+          ClusterIDMapping.AccessControl.ID,
+          ClusterIDMapping.AccessControl.Attribute.Acl.id,
+          tlvWriter.getEncoded()
+        )
+      ),
+      0,
+      0
+    )
+  }
+
+  private suspend fun readAttributeBtnClick() {
+    val attribute = attributeList[binding.attributeSp.selectedItemPosition]
+    val endpointId = OTA_REQUESTER_ENDPOINT_ID
+    val clusterId = ClusterIDMapping.OtaSoftwareUpdateRequestor.ID
+    val attributeId = attribute.id
+    val path = ChipAttributePath.newInstance(endpointId, clusterId, attributeId)
+    deviceController.readAttributePath(
+      object : ReportCallback {
+        override fun onError(
+          attributePath: ChipAttributePath?,
+          eventPath: ChipEventPath?,
+          e: Exception
+        ) {
+          requireActivity().runOnUiThread {
+            Toast.makeText(
+                requireActivity(),
+                R.string.ota_provider_invalid_attribute,
+                Toast.LENGTH_SHORT
+              )
+              .show()
+          }
+        }
+
+        override fun onReport(nodeState: NodeState?) {
+          val tlv =
+            nodeState
+              ?.getEndpointState(endpointId)
+              ?.getClusterState(clusterId)
+              ?.getAttributeState(attributeId)
+              ?.tlv
+
+          val value = tlv?.let { TlvReader(it).toAny() }
+          Log.i(TAG, "OtaSoftwareUpdateRequestor ${attribute.name} value: $value")
+          showMessage("OtaSoftwareUpdateRequestor ${attribute.name} value: $value")
+        }
+      },
+      ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId),
+      listOf<ChipAttributePath>(path),
+      0
+    )
+  }
+
+  private fun writeAttributeBtnClick() {
+    val attribute = attributeList[binding.attributeSp.selectedItemPosition]
+    if (attribute != ClusterIDMapping.OtaSoftwareUpdateRequestor.Attribute.DefaultOTAProviders) {
+      requireActivity().runOnUiThread {
+        Toast.makeText(
+            requireActivity(),
+            R.string.ota_provider_invalid_attribute,
+            Toast.LENGTH_SHORT
+          )
+          .show()
+      }
+      return
+    }
+    val dialogView =
+      requireActivity().layoutInflater.inflate(R.layout.write_default_otaproviders_dialog, null)
+    val fabricIndexEd = dialogView.findViewById<EditText>(R.id.fabricIndexEd)
+    val providerNodeIdEd = dialogView.findViewById<EditText>(R.id.providerNodeIdEd)
+    val endpointIdEd = dialogView.findViewById<EditText>(R.id.endpointIdEd)
+
+    fabricIndexEd.setText(deviceController.fabricIndex.toUInt().toString())
+    providerNodeIdEd.setText(deviceController.controllerNodeId.toULong().toString())
+    endpointIdEd.setText(OTA_PROVIDER_ENDPOINT_ID.toUInt().toString())
+
+    val dialog = AlertDialog.Builder(requireContext()).apply { setView(dialogView) }.create()
+
+    dialogView.findViewById<Button>(R.id.writeDefaultOtaProvidersBtn).setOnClickListener {
+      scope.launch {
+        sendWriteDefaultOTAProviders(
+          providerNodeIdEd.text.toString().toULong(),
+          endpointIdEd.text.toString().toUInt(),
+          fabricIndexEd.text.toString().toUInt()
+        )
+        requireActivity().runOnUiThread { dialog.dismiss() }
+      }
+    }
+    dialog.show()
+  }
+
+  private suspend fun sendWriteDefaultOTAProviders(
+    providerNodeId: ULong,
+    endpointId: UInt,
+    fabricIndex: UInt
+  ) {
+    val endpoint = OTA_REQUESTER_ENDPOINT_ID
+    val clusterId = ClusterIDMapping.OtaSoftwareUpdateRequestor.ID
+    val attributeId = ClusterIDMapping.OtaSoftwareUpdateRequestor.Attribute.DefaultOTAProviders.id
+
+    val tlv =
+      TlvWriter()
+        .apply {
+          startArray(AnonymousTag)
+          OtaSoftwareUpdateRequestorClusterProviderLocation(providerNodeId, endpointId, fabricIndex)
+            .toTlv(AnonymousTag, this)
+          endArray()
+        }
+        .getEncoded()
+
+    val writeRequest = AttributeWriteRequest.newInstance(endpoint, clusterId, attributeId, tlv)
+
+    deviceController.write(
+      object : WriteAttributesCallback {
+        override fun onError(attributePath: ChipAttributePath?, e: Exception?) {
+          Log.d(TAG, "onError")
+          showMessage("error : ${e.toString()}")
+        }
+
+        override fun onResponse(attributePath: ChipAttributePath?) {
+          Log.d(TAG, "onResponse")
+          showMessage("write success")
+        }
+      },
+      ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId),
+      listOf<AttributeWriteRequest>(writeRequest),
+      0,
+      0
+    )
+  }
+
+  private fun setQueryImageSpinnerListener() {
+    val statusList = QueryImageResponseStatusEnum.values()
+    binding.titleStatusSp.adapter =
+      ArrayAdapter(requireContext(), android.R.layout.simple_spinner_dropdown_item, statusList)
+    binding.titleStatusSp.onItemSelectedListener =
+      object : AdapterView.OnItemSelectedListener {
+        override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+          val isBusy = statusList[position] == QueryImageResponseStatusEnum.Busy
+
+          requireActivity().runOnUiThread {
+            binding.delayActionTimeTv.visibility =
+              if (isBusy) {
+                View.VISIBLE
+              } else {
+                View.GONE
+              }
+            binding.delayActionTimeEd.visibility = binding.delayActionTimeTv.visibility
+          }
+        }
+
+        override fun onNothingSelected(parent: AdapterView<*>?) {
+          Log.d(TAG, "onNothingSelected")
+        }
+      }
+  }
+
   private fun selectFirmwareFileBtnClick() {
     startActivityForResult(
       Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
@@ -116,15 +435,30 @@ class OtaProviderClientFragment : Fragment() {
     requireActivity().runOnUiThread { binding.firmwareFileTv.text = filename }
   }
 
-  private suspend fun sendAnnounceOTAProviderBtnClick() {
-    requireActivity().runOnUiThread {
-      val version = 2L
-      val versionString = "2.0"
-
-      val filename = binding.firmwareFileTv.text.toString()
-      Log.d(TAG, "sendAnnounceOTAProviderBtnClick : $filename")
-      otaProviderCallback.setOTAFile(version, versionString, filename, fileUri)
+  private fun updateOTAStatusBtnClick() {
+    val version = 2L
+    val versionString = "2.0"
+
+    val filename = binding.firmwareFileTv.text.toString()
+    Log.d(TAG, "updateOTAStatusBtnClick : $filename")
+
+    when (binding.titleStatusSp.selectedItem.toString()) {
+      QueryImageResponseStatusEnum.UpdateAvailable.name ->
+        otaProviderCallback.setOTAFile(version, versionString, filename, fileUri)
+      QueryImageResponseStatusEnum.Busy.name ->
+        otaProviderCallback.setOTABusyError(
+          binding.delayActionTimeEd.text.toString().toUInt(),
+          binding.titleUserConsentNeededSp.selectedItem.toString().toBoolean()
+        )
+      QueryImageResponseStatusEnum.NotAvailable.name ->
+        otaProviderCallback.setOTANotAvailableError(
+          binding.titleUserConsentNeededSp.selectedItem.toString().toBoolean()
+        )
     }
+  }
+
+  private suspend fun sendAnnounceOTAProviderBtnClick() {
+    requireActivity().runOnUiThread { updateOTAStatusBtnClick() }
 
     val otaRequestCluster =
       ChipClusters.OtaSoftwareUpdateRequestorCluster(
@@ -166,11 +500,36 @@ class OtaProviderClientFragment : Fragment() {
     private var inputStream: InputStream? = null
     private var bufferedInputStream: BufferedInputStream? = null
 
-    fun setOTAFile(version: Long, versionString: String, fileName: String, uri: Uri?) {
+    private var status: QueryImageResponseStatusEnum? = null
+    private var delayedTime: UInt? = null
+    private var userConsentNeeded: Boolean? = null
+
+    fun setOTAFile(
+      version: Long,
+      versionString: String,
+      fileName: String,
+      uri: Uri?,
+      userConsentNeeded: Boolean? = null
+    ) {
+      this.status = QueryImageResponseStatusEnum.UpdateAvailable
       this.version = version
       this.versionString = versionString
       this.fileName = fileName
       this.uri = uri
+      this.delayedTime = null
+      this.userConsentNeeded = userConsentNeeded
+    }
+
+    fun setOTABusyError(delayedTime: UInt, userConsentNeeded: Boolean? = null) {
+      this.status = QueryImageResponseStatusEnum.Busy
+      this.delayedTime = delayedTime
+      this.userConsentNeeded = userConsentNeeded
+    }
+
+    fun setOTANotAvailableError(userConsentNeeded: Boolean? = null) {
+      this.status = QueryImageResponseStatusEnum.NotAvailable
+      this.delayedTime = null
+      this.userConsentNeeded = userConsentNeeded
     }
 
     override fun handleQueryImage(
@@ -181,18 +540,30 @@ class OtaProviderClientFragment : Fragment() {
       location: String?,
       requestorCanConsent: Boolean?,
       metadataForProvider: ByteArray?
-    ): OTAProviderDelegate.QueryImageResponse {
+    ): OTAProviderDelegate.QueryImageResponse? {
       Log.d(
         TAG,
         "handleQueryImage, $vendorId, $productId, $softwareVersion, $hardwareVersion, $location"
       )
-      return OTAProviderDelegate.QueryImageResponse(version, versionString, fileName)
+
+      return when (status) {
+        QueryImageResponseStatusEnum.UpdateAvailable ->
+          OTAProviderDelegate.QueryImageResponse(version, versionString, fileName, null)
+        QueryImageResponseStatusEnum.Busy ->
+          OTAProviderDelegate.QueryImageResponse(
+            status,
+            delayedTime?.toLong() ?: 0,
+            userConsentNeeded ?: false
+          )
+        QueryImageResponseStatusEnum.NotAvailable ->
+          OTAProviderDelegate.QueryImageResponse(status, userConsentNeeded ?: false)
+        else -> null
+      }
     }
 
     override fun handleOTAQueryFailure(error: Int) {
       Log.d(TAG, "handleOTAQueryFailure, $error")
       showMessage("handleOTAQueryFailure : $error")
-      deviceController.finishOTAProvider()
     }
 
     override fun handleApplyUpdateRequest(
diff --git a/examples/android/CHIPTool/app/src/main/res/layout/add_access_control_dialog.xml b/examples/android/CHIPTool/app/src/main/res/layout/add_access_control_dialog.xml
index 200b509e8c8e41..a09325ad3b8ce6 100644
--- a/examples/android/CHIPTool/app/src/main/res/layout/add_access_control_dialog.xml
+++ b/examples/android/CHIPTool/app/src/main/res/layout/add_access_control_dialog.xml
@@ -24,6 +24,19 @@
       android:layout_marginBottom="8dp"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@id/titleText"
+      app:layout_constraintBottom_toTopOf="@+id/nodeIdEd"/>
+
+  <EditText
+      android:id="@+id/nodeIdEd"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/ota_provider_node_id_text"
+      android:inputType="number"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      android:visibility="gone"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/groupIdEd"
       app:layout_constraintBottom_toTopOf="@+id/accessControlEntryTv"/>
 
   <TextView
@@ -34,7 +47,7 @@
       android:textSize="16sp"
       android:layout_marginTop="8dp"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/groupIdEd"
+      app:layout_constraintTop_toBottomOf="@id/nodeIdEd"
       app:layout_constraintBottom_toTopOf="@id/accessControlEntrySp"
       />
 
@@ -47,7 +60,7 @@
       android:layout_marginBottom="8dp"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@id/accessControlEntryTv"
-      app:layout_constraintBottom_toTopOf="@+id/addGroupDialogBtn"/>
+      app:layout_constraintBottom_toTopOf="@+id/addAccessControlBtn"/>
 
   <Button
       android:id="@+id/addAccessControlBtn"
diff --git a/examples/android/CHIPTool/app/src/main/res/layout/ota_provider_client_fragment.xml b/examples/android/CHIPTool/app/src/main/res/layout/ota_provider_client_fragment.xml
index 0fb7fe12f9e1c8..3d591f38b3435e 100644
--- a/examples/android/CHIPTool/app/src/main/res/layout/ota_provider_client_fragment.xml
+++ b/examples/android/CHIPTool/app/src/main/res/layout/ota_provider_client_fragment.xml
@@ -11,30 +11,148 @@
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true" />
 
+    <TextView
+        android:id="@+id/titleStatus"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/ota_provider_query_image_response_status_text"
+        android:textSize="16sp"
+        android:layout_below="@id/addressUpdateFragment" />
+
+    <Spinner
+        android:id="@+id/titleStatusSp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:hint="@string/subscribe_dialog_keep_subscriptions_hint"
+        android:inputType="text"
+        android:spinnerMode="dropdown"
+        android:textSize="16sp"
+        android:layout_below="@id/titleStatus" />
+
     <EditText
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/vendorIdTv"
+        android:id="@+id/delayActionTimeTv"
         android:textSize="16sp"
         android:padding="16dp"
-        android:layout_margin="8dp"
         android:layout_alignParentStart="true"
         android:enabled="false"
-        android:text="@string/ota_provider_vendorId_text"
-        android:layout_below="@id/addressUpdateFragment" />
+        android:text="@string/ota_provider_delayed_action_time_text"
+        android:visibility="gone"
+        android:layout_below="@id/titleStatusSp" />
 
     <EditText
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/vendorIdEd"
+        android:id="@+id/delayActionTimeEd"
         android:textSize="16sp"
         android:padding="16dp"
-        android:layout_margin="8dp"
+        android:visibility="gone"
         android:layout_toEndOf="@id/vendorIdTv"
-        android:layout_below="@id/addressUpdateFragment"
-        android:autofillHints="@string/ota_provider_vendorId_text"
+        android:layout_below="@id/titleStatusSp"
+        android:autofillHints="@string/ota_provider_delayed_action_time_text"
         android:inputType="numberDecimal" />
 
+    <TextView
+        android:id="@+id/titleUserConsentNeeded"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/ota_provider_user_consent_needed_text"
+        android:textSize="16sp"
+        android:layout_below="@id/delayActionTimeTv" />
+
+    <Spinner
+        android:id="@+id/titleUserConsentNeededSp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:entries="@array/chip_select_menu"
+        android:inputType="text"
+        android:spinnerMode="dropdown"
+        android:textSize="16sp"
+        android:layout_below="@id/titleUserConsentNeeded" />
+
+    <TextView
+        android:id="@+id/titleRWAttribute"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/ota_provider_read_write_attribute_text"
+        android:textSize="16sp"
+        android:layout_below="@id/titleUserConsentNeededSp" />
+
+    <TextView
+        android:id="@+id/writeAclBtn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/titleUserConsentNeededSp"
+        android:layout_marginStart="5dp"
+        android:layout_marginTop="5dp"
+        android:layout_marginEnd="5dp"
+        android:layout_marginBottom="5dp"
+        android:layout_toStartOf="@id/readAttributeBtn"
+        android:background="@android:color/darker_gray"
+        android:padding="5dp"
+        android:text="@string/ota_provider_write_acl_btn_text"
+        android:textSize="16sp" />
+
+    <TextView
+        android:id="@+id/readAttributeBtn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/ota_provider_read_attribute_btn_text"
+        android:padding="5dp"
+        android:layout_margin="5dp"
+        android:background="@android:color/darker_gray"
+        android:textSize="16sp"
+        android:layout_toStartOf="@id/writeAttributeBtn"
+        android:layout_below="@id/titleUserConsentNeededSp" />
+
+    <TextView
+        android:id="@+id/writeAttributeBtn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/ota_provider_write_attribute_btn_text"
+        android:padding="5dp"
+        android:layout_margin="5dp"
+        android:background="@android:color/darker_gray"
+        android:textSize="16sp"
+        android:layout_alignParentEnd="true"
+        android:layout_below="@id/titleUserConsentNeededSp" />
+
+    <Spinner
+        android:id="@+id/attributeSp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:inputType="text"
+        android:spinnerMode="dropdown"
+        android:textSize="16sp"
+        android:layout_below="@id/titleRWAttribute" />
+
+    <EditText
+        android:id="@+id/vendorIdTv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/attributeSp"
+        android:layout_alignParentStart="true"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:enabled="false"
+        android:padding="8dp"
+        android:text="@string/ota_provider_vendorId_text"
+        android:textSize="16sp" />
+
+    <EditText
+        android:id="@+id/vendorIdEd"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/attributeSp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_toEndOf="@id/vendorIdTv"
+        android:autofillHints="@string/ota_provider_vendorId_text"
+        android:inputType="numberDecimal"
+        android:padding="8dp"
+        android:textSize="16sp" />
+
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:orientation="vertical"
         android:layout_width="match_parent"
@@ -45,17 +163,26 @@
             android:id="@+id/selectFirmwareFileBtn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="16dp"
+            android:padding="8dp"
             android:layout_margin="8dp"
             android:layout_columnWeight="1"
             android:background="@android:color/darker_gray"
             android:text="@string/ota_provider_select_firmware_file_text"
             android:textSize="16sp"/>
+        <TextView
+            android:id="@+id/updateOTAStatusBtn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="8dp"
+            android:layout_margin="8dp"
+            android:background="@android:color/darker_gray"
+            android:text="@string/ota_provider_update_ota_status_text"
+            android:textSize="16sp"/>
         <TextView
             android:id="@+id/announceOTAProviderBtn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="16dp"
+            android:padding="8dp"
             android:layout_margin="8dp"
             android:background="@android:color/darker_gray"
             android:text="@string/ota_provider_start_firmware_update_text"
@@ -65,12 +192,13 @@
         android:id="@+id/firmwareFileTv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_columnWeight="1"
         android:layout_below="@id/buttonLayout"
-        android:padding="16dp"
-        android:layout_margin="8dp"
         android:layout_gravity="center"
-        android:layout_columnWeight="4"
-        android:textSize="16sp"/>
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:textSize="12sp" />
+
     <TextView
         android:id="@+id/commandStatusTv"
         android:layout_width="match_parent"
@@ -79,5 +207,5 @@
         android:padding="16dp"
         android:minLines="4"
         android:singleLine="false"
-        android:textSize="20sp" />
+        android:textSize="16sp" />
 </RelativeLayout>
diff --git a/examples/android/CHIPTool/app/src/main/res/layout/write_default_otaproviders_dialog.xml b/examples/android/CHIPTool/app/src/main/res/layout/write_default_otaproviders_dialog.xml
new file mode 100644
index 00000000000000..2eb5b037294726
--- /dev/null
+++ b/examples/android/CHIPTool/app/src/main/res/layout/write_default_otaproviders_dialog.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="16dp">
+  <TextView
+      android:id="@+id/titleText"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/ota_provider_write_default_ota_providers_text"
+      android:textSize="22sp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
+
+  <EditText
+      android:id="@+id/fabricIndexEd"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/ota_provider_fabric_index_text"
+      android:inputType="number"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/titleText"
+      app:layout_constraintBottom_toTopOf="@id/providerNodeIdEd"/>
+
+  <EditText
+      android:id="@+id/providerNodeIdEd"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/ota_provider_provider_node_id_text"
+      android:inputType="number"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/fabricIndexEd"
+      app:layout_constraintBottom_toTopOf="@id/endpointIdEd"/>
+
+  <EditText
+      android:id="@+id/endpointIdEd"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:hint="@string/ota_provider_endpoint_id_text"
+      android:inputType="number"
+      android:textSize="16sp"
+      android:layout_marginBottom="8dp"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/providerNodeIdEd"
+      app:layout_constraintBottom_toTopOf="@id/writeDefaultOtaProvidersBtn"/>
+
+  <Button
+      android:id="@+id/writeDefaultOtaProvidersBtn"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/group_setting_write_btn_text"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/examples/android/CHIPTool/app/src/main/res/values/strings.xml b/examples/android/CHIPTool/app/src/main/res/values/strings.xml
index 5d31d6adbf3628..88bb47ffe311e8 100644
--- a/examples/android/CHIPTool/app/src/main/res/values/strings.xml
+++ b/examples/android/CHIPTool/app/src/main/res/values/strings.xml
@@ -256,7 +256,22 @@
     <string name="group_setting_write_btn_text">Write</string>
 
     <string name="ota_provider_btn_text">OTA Provider</string>
+    <string name="ota_provider_query_image_response_status_text">Query Image Response Status</string>
+    <string name="ota_provider_delayed_action_time_text">DelayTime</string>
+    <string name="ota_provider_user_consent_needed_text">User Consent Needed (bool)</string>
+    <string name="ota_provider_read_write_attribute_text">R/W Attribute</string>
+    <string name="ota_provider_write_acl_btn_text">Write Acl</string>
+    <string name="ota_provider_read_attribute_btn_text">Read</string>
+    <string name="ota_provider_write_attribute_btn_text">Write</string>
     <string name="ota_provider_vendorId_text">Vendor ID</string>
     <string name="ota_provider_select_firmware_file_text">Select Firmware</string>
+    <string name="ota_provider_update_ota_status_text">Update OTA Status</string>
     <string name="ota_provider_start_firmware_update_text">Start Firmware Update</string>
+    <string name="ota_provider_invalid_attribute">Invalid Attribute</string>
+    <string name="ota_provider_write_default_ota_providers_text">Write Default OTA Providers</string>
+    <string name="ota_provider_fabric_index_text">Fabric Index</string>
+    <string name="ota_provider_provider_node_id_text">Provider Node ID</string>
+    <string name="ota_provider_endpoint_id_text">Endpoint ID</string>
+    <string name="ota_provider_write_text">Write</string>
+    <string name="ota_provider_node_id_text">Node ID</string>
 </resources>
diff --git a/kotlin-detect-config.yaml b/kotlin-detect-config.yaml
index dd32886efa52d7..3ca00b718ca139 100644
--- a/kotlin-detect-config.yaml
+++ b/kotlin-detect-config.yaml
@@ -280,6 +280,7 @@ complexity:
             - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt"
             - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/GroupSettingFragment.kt"
             - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OnOffClientFragment.kt"
+            - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/OtaProviderClientFragment.kt"
             - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/SensorClientFragment.kt"
             - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/WildcardFragment.kt"
             - "**/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/GenericChipDeviceListener.kt"
diff --git a/src/controller/java/OTAProviderDelegateBridge.cpp b/src/controller/java/OTAProviderDelegateBridge.cpp
index dfde8ff7c79836..905741acf58648 100644
--- a/src/controller/java/OTAProviderDelegateBridge.cpp
+++ b/src/controller/java/OTAProviderDelegateBridge.cpp
@@ -119,19 +119,26 @@ void OTAProviderDelegateBridge::HandleQueryImage(CommandHandler * commandObj, co
     jobject boxedRequestorCanConsent = nullptr;
     jobject boxedMetadataForProvider = nullptr;
     jobject jResponse                = nullptr;
+    jobject boxedDelayedActionTime   = nullptr;
+    jobject boxedUserConsentNeeded   = nullptr;
 
     jmethodID getSoftwareVersionMethod       = nullptr;
     jmethodID getSoftwareVersionStringMethod = nullptr;
     jmethodID getFilePathMethod              = nullptr;
+    jmethodID getStatushMethod               = nullptr;
+    jmethodID getDelayedActionTimeMethod     = nullptr;
+    jmethodID getUserConsentNeededMethod     = nullptr;
 
     jobject jSoftwareVersion       = nullptr;
     jstring jSoftwareVersionString = nullptr;
     jstring jFilePath              = nullptr;
 
+    jint jStatus   = 0;
+    uint8_t status = 0;
+
     bool hasUpdate = false;
     Commands::QueryImageResponse::Type response;
-    Commands::QueryImageResponse::Type errorResponse;
-    errorResponse.status = OTAQueryStatus::kNotAvailable;
+    response.status = OTAQueryStatus::kNotAvailable;
 
     char uriBuffer[kMaxBDXURILen];
     MutableCharSpan uri(uriBuffer);
@@ -175,8 +182,8 @@ void OTAProviderDelegateBridge::HandleQueryImage(CommandHandler * commandObj, co
     // If the protocol requested is not supported, return status - Protocol Not Supported
     if (!isBDXProtocolSupported)
     {
-        errorResponse.status = OTAQueryStatus::kDownloadProtocolNotSupported;
-        err                  = CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+        response.status = OTAQueryStatus::kDownloadProtocolNotSupported;
+        err             = CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
         ExitNow();
     }
 
@@ -228,8 +235,8 @@ void OTAProviderDelegateBridge::HandleQueryImage(CommandHandler * commandObj, co
     // If update is not available, return the delegate response
     if (!hasUpdate)
     {
-        errorResponse.status = OTAQueryStatus::kNotAvailable;
-        err                  = CHIP_ERROR_INTERNAL;
+        response.status = OTAQueryStatus::kNotAvailable;
+        err             = CHIP_ERROR_INTERNAL;
         ExitNow();
     }
 
@@ -244,6 +251,45 @@ void OTAProviderDelegateBridge::HandleQueryImage(CommandHandler * commandObj, co
     err = JniReferences::GetInstance().FindMethod(env, jResponse, "getFilePath", "()Ljava/lang/String;", &getFilePathMethod);
     VerifyOrExit(err == CHIP_NO_ERROR, ChipLogError(Controller, "Could not find getFilePath method"));
 
+    err = JniReferences::GetInstance().FindMethod(env, jResponse, "getStatus", "()I", &getStatushMethod);
+    VerifyOrExit(err == CHIP_NO_ERROR, ChipLogError(Controller, "Could not find getStatus method"));
+
+    err = JniReferences::GetInstance().FindMethod(env, jResponse, "getDelayedActionTime", "()Ljava/lang/Long;",
+                                                  &getDelayedActionTimeMethod);
+    VerifyOrExit(err == CHIP_NO_ERROR, ChipLogError(Controller, "Could not find getDelayedActionTime method"));
+
+    err = JniReferences::GetInstance().FindMethod(env, jResponse, "getUserConsentNeeded", "()Ljava/lang/Boolean;",
+                                                  &getUserConsentNeededMethod);
+    VerifyOrExit(err == CHIP_NO_ERROR, ChipLogError(Controller, "Could not find getUserConsentNeeded method"));
+
+    jStatus                = env->CallIntMethod(jResponse, getStatushMethod);
+    boxedUserConsentNeeded = env->CallObjectMethod(jResponse, getUserConsentNeededMethod);
+
+    // UserConsentNeeded Field, if present, SHALL only be interpreted if the OTA Requestor had previously indicated a value of True
+    // in the RequestorCanConsent field of the QueryImageRequest.
+    if (boxedUserConsentNeeded != nullptr)
+    {
+        jboolean userConsentNeeded = JniReferences::GetInstance().BooleanToPrimitive(boxedUserConsentNeeded);
+        response.userConsentNeeded.SetValue(userConsentNeeded == JNI_TRUE);
+    }
+
+    status = static_cast<uint8_t>(jStatus);
+    if (status == static_cast<uint8_t>(OTAQueryStatus::kNotAvailable))
+    {
+        err             = CHIP_ERROR_INTERNAL;
+        response.status = OTAQueryStatus::kNotAvailable;
+        ExitNow();
+    }
+    else if (status == static_cast<uint8_t>(OTAQueryStatus::kBusy))
+    {
+        err                    = CHIP_ERROR_BUSY;
+        response.status        = OTAQueryStatus::kBusy;
+        boxedDelayedActionTime = env->CallObjectMethod(jResponse, getDelayedActionTimeMethod);
+        response.delayedActionTime.SetValue(
+            static_cast<uint32_t>(JniReferences::GetInstance().LongToPrimitive(boxedDelayedActionTime)));
+        ExitNow();
+    }
+
     jSoftwareVersion       = env->CallObjectMethod(jResponse, getSoftwareVersionMethod);
     jSoftwareVersionString = (jstring) env->CallObjectMethod(jResponse, getSoftwareVersionStringMethod);
     jFilePath              = (jstring) env->CallObjectMethod(jResponse, getFilePathMethod);
@@ -277,8 +323,8 @@ void OTAProviderDelegateBridge::HandleQueryImage(CommandHandler * commandObj, co
             if (err == CHIP_ERROR_BUSY)
             {
                 ChipLogError(Controller, "Responding with Busy due to being in the middle of handling another BDX transfer");
-                errorResponse.status = OTAQueryStatus::kBusy;
-                errorResponse.delayedActionTime.SetValue(kDelayedActionTimeSeconds);
+                response.status = OTAQueryStatus::kBusy;
+                response.delayedActionTime.SetValue(kDelayedActionTimeSeconds);
                 // We do not reset state when we get the busy error because that means we are locked in a BDX transfer
                 // session with another requestor when we get this query image request. We do not want to interrupt the
                 // ongoing transfer instead just respond to the second requestor with a busy status and a delayedActionTime
@@ -306,10 +352,9 @@ void OTAProviderDelegateBridge::HandleQueryImage(CommandHandler * commandObj, co
     return;
 
 exit:
-    ChipLogError(Controller, "OTA Query Failure : %u, %" CHIP_ERROR_FORMAT, static_cast<uint8_t>(errorResponse.status),
-                 err.Format());
-    commandObj->AddResponse(cachedCommandPath, errorResponse);
-    sendOTAQueryFailure(static_cast<uint8_t>(errorResponse.status));
+    ChipLogError(Controller, "OTA Query Failure : %u, %" CHIP_ERROR_FORMAT, static_cast<uint8_t>(response.status), err.Format());
+    commandObj->AddResponse(cachedCommandPath, response);
+    sendOTAQueryFailure(static_cast<uint8_t>(response.status));
 }
 
 void OTAProviderDelegateBridge::HandleApplyUpdateRequest(CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
diff --git a/src/controller/java/src/chip/devicecontroller/OTAProviderDelegate.java b/src/controller/java/src/chip/devicecontroller/OTAProviderDelegate.java
index 7cfd90d38a54ec..32b524b4aeeb14 100644
--- a/src/controller/java/src/chip/devicecontroller/OTAProviderDelegate.java
+++ b/src/controller/java/src/chip/devicecontroller/OTAProviderDelegate.java
@@ -129,12 +129,32 @@ public class QueryImageResponse {
     @Nullable Long softwareVersion;
     @Nullable String softwareVersionString;
     @Nullable String filePath;
+    QueryImageResponseStatusEnum status;
+    @Nullable Boolean userConsentNeeded = null;
+    @Nullable Long delayedActionTime = null;
 
     public QueryImageResponse(
-        @Nullable Long softwareVersion, @Nullable String softwareVersionString, String filePath) {
+        @Nullable Long softwareVersion,
+        @Nullable String softwareVersionString,
+        String filePath,
+        Boolean userConsentNeeded) {
+      this.status = QueryImageResponseStatusEnum.UpdateAvailable;
       this.softwareVersion = softwareVersion;
       this.softwareVersionString = softwareVersionString;
       this.filePath = filePath;
+      this.userConsentNeeded = userConsentNeeded;
+    }
+
+    public QueryImageResponse(
+        QueryImageResponseStatusEnum status, long delayedActionTime, Boolean userConsentNeeded) {
+      this.status = status;
+      this.delayedActionTime = delayedActionTime;
+      this.userConsentNeeded = userConsentNeeded;
+    }
+
+    public QueryImageResponse(QueryImageResponseStatusEnum status, Boolean userConsentNeeded) {
+      this.status = status;
+      this.userConsentNeeded = userConsentNeeded;
     }
 
     public Long getSoftwareVersion() {
@@ -148,6 +168,37 @@ public String getSoftwareVersionString() {
     public String getFilePath() {
       return filePath;
     }
+
+    public int getStatus() {
+      return status.getValue();
+    }
+
+    public Long getDelayedActionTime() {
+      return delayedActionTime;
+    }
+
+    public Boolean getUserConsentNeeded() {
+      return userConsentNeeded;
+    }
+  }
+
+  // See Refer CompatEnumNames.h
+  public enum QueryImageResponseStatusEnum {
+    // Enum for QueryImageResponseStatusEnum
+    UpdateAvailable(0x00),
+    Busy(0x01),
+    NotAvailable(0x02),
+    DownloadProtocolNotSupported(0x03);
+
+    private int value;
+
+    QueryImageResponseStatusEnum(int value) {
+      this.value = value;
+    }
+
+    public int getValue() {
+      return value;
+    }
   }
 
   /**