commit b8cf4cfcf3dfcf3e7f892fc93d2c3435dcaf86a9
author qctecmdr <qctecmdr@localhost> Sat Jun 17 03:50:16 2023 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Jun 17 03:50:15 2023 -0700
tree bbb75878a087659ca0c27c65489020301550c24f
parent 874ce6871db1cb282c6c6f8b400c0a4b8a80cef7
parent b4212a95f47b544b76160cc6e4cb051cabeb0520

Merge "pal: configs:add xml configs for kalama apq variant"

resource_manager/src/ResourceManager.cpp

diff --git a/resource_manager/src/ResourceManager.cpp b/resource_manager/src/ResourceManager.cpp
index 9f554f8..8f65183 100644
--- a/resource_manager/src/ResourceManager.cpp
+++ b/resource_manager/src/ResourceManager.cpp
@@ -11993,6 +11993,7 @@
     std::vector<std::shared_ptr<Device>> activeDeviceList;
     pal_ultrasound_gain_t gain_2 = PAL_ULTRASOUND_GAIN_MUTE;
 
+    memset(&sAttr, 0, sizeof(sAttr));
     PAL_INFO(LOG_TAG, "Entered. Gain = %d", gain);
 
     if (!IsCustomGainEnabledForUPD()) {

resource_manager/src/SndCardMonitor.cpp

diff --git a/resource_manager/src/SndCardMonitor.cpp b/resource_manager/src/SndCardMonitor.cpp
index 854f9a9..b2154f8 100644
--- a/resource_manager/src/SndCardMonitor.cpp
+++ b/resource_manager/src/SndCardMonitor.cpp
@@ -25,6 +25,11 @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Changes from Qualcomm Innovation Center are provided under the following license:
+ *
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause-Clear
  */
 
 #define LOG_TAG "PAL: SndMonitor"
@@ -49,7 +54,7 @@
 {
     struct pollfd *poll_fds;
     int rv = 0;
-    char buf[10];
+    char buf[12];
     int card_status = 0;
     int tries = MAX_SLEEP_RETRY;
 

utils/src/ChargerListener.cpp

diff --git a/utils/src/ChargerListener.cpp b/utils/src/ChargerListener.cpp
index c953d5f..685e40a 100644
--- a/utils/src/ChargerListener.cpp
+++ b/utils/src/ChargerListener.cpp
@@ -19,7 +19,7 @@
 *
 * Changes from Qualcomm Innovation Center are provided under the following
 * license:
-* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted (subject to the limitations in the
@@ -385,7 +385,7 @@
 int ChargerListenerImpl::getConcurrentState()
 {
     int status_bit = -EINVAL;
-    char state[2];
+    char state[12];
 
     mlock.lock();
     if (0 != readSysfsPath(BOOST_CONCURRENT_PATH, O_RDONLY, 2, state)) {