commit 2a34b6a3e8f6e3cd51bd771907a3ee6eff702a8b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jan 10 00:25:37 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jan 10 00:25:37 2023 +0000
tree efc699429a408175264110db692cef4b76564daf
parent bc189ecda12aa3ac540d6c495f9a0ee58d4f0f6d
parent 4c7892059f1722aff75111627dcdb49ece7e52a1

Snap for 9470583 from 4c7892059f1722aff75111627dcdb49ece7e52a1 to tm-qpr3-release

Change-Id: I928d4eae390e609a84158b9131d8f4307f5ad44c

apex/apex_manifest.json

diff --git a/apex/apex_manifest.json b/apex/apex_manifest.json
index 88baf79..39fe86f 100644
--- a/apex/apex_manifest.json
+++ b/apex/apex_manifest.json
@@ -1,5 +1,5 @@
 {
   "name": "com.android.uwb",
-  "version": 339990000
+  "version": 330400000
 }
 

service/uci/jni/UwbEventManager.cpp

diff --git a/service/uci/jni/UwbEventManager.cpp b/service/uci/jni/UwbEventManager.cpp
index e670f7a..487769f 100755
--- a/service/uci/jni/UwbEventManager.cpp
+++ b/service/uci/jni/UwbEventManager.cpp
@@ -291,6 +291,12 @@
     return;
   }
 
+  if (multicast_list_ntf->no_of_controlees > MAX_NUM_CONTROLLEES) {
+    JNI_TRACE_E("%s: no Of Controlees %d exceeded max allowed: %d ", fn,
+                multicast_list_ntf->no_of_controlees, MAX_NUM_CONTROLLEES);
+    return;
+  }
+
   jintArray controleeMacAddressArray =
       env->NewIntArray(multicast_list_ntf->no_of_controlees);
   jlongArray subSessionIdArray =