commit 75aef69393a219fde6cc3fe12817c5f0d994b137
author Dhananjay Kumar <dhakumar@codeaurora.org> Tue Jan 21 17:46:02 2020 +0530
committer Dhananjay Kumar <dhakumar@codeaurora.org> Wed Jan 22 16:09:54 2020 +0530
tree f210229623fca5040420ceb9da1a3b4b74068cc4
parent 348c433e281b2bcbbf5367c96672faa5481c5c59

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

Bug: 147764906
Change-Id: Ie5d3630d0cd2b3adab223c78a24373816575b26f

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 {