commit 3f4598178ef62d1f12bc7960dfcd93e880acc5b3
author qctecmdr <qctecmdr@localhost> Fri Jan 24 09:48:25 2020 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jan 24 09:48:25 2020 -0800
tree 33b6ed80ee7c5bcd3a3b9c940e15ce3f284c9671
parent 3a51a92ba144bdb15f2b0abacceba08319d0a448
parent 75aef69393a219fde6cc3fe12817c5f0d994b137

Merge "policy_hal: fix compilation error after enabling -Wdangling-gsl flag"

policy_hal/AudioPolicyManager.cpp

diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index 2f36958..a4bc087 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2020 The Linux Foundation. All rights reserved.
  * Not a contribution.
  *
  * Copyright (C) 2009 The Android Open Source Project
@@ -58,18 +58,18 @@
 audio_output_flags_t AudioPolicyManagerCustom::getFallBackPath()
 {
     audio_output_flags_t flag = AUDIO_OUTPUT_FLAG_FAST;
-    const char *fallback_path = mApmConfigs->getVoiceConcFallbackPath().c_str();
+    std::string fallback_path = mApmConfigs->getVoiceConcFallbackPath();
 
-    if (strlen(fallback_path) > 0) {
-        if (!strncmp(fallback_path, "deep-buffer", 11)) {
+    if (strlen(fallback_path.c_str()) > 0) {
+        if (!strncmp(fallback_path.c_str(), "deep-buffer", 11)) {
             flag = AUDIO_OUTPUT_FLAG_DEEP_BUFFER;
         }
-        else if (!strncmp(fallback_path, "fast", 4)) {
+        else if (!strncmp(fallback_path.c_str(), "fast", 4)) {
             flag = AUDIO_OUTPUT_FLAG_FAST;
         }
         else {
             ALOGD("voice_conc:not a recognised path(%s) in prop vendor.voice.conc.fallbackpath",
-                 fallback_path);
+                 fallback_path.c_str());
         }
     }
     else {