From a63b53f9a86a1898dc2d415a20ae100afd4832e9 Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Mon, 18 Nov 2019 11:03:13 -0800
Subject: [PATCH] hal(wifi): Set HAL logd severity based on ringbuffer
 verbosity

This avoid the framework from setting the HAL daemon's log severity when
verbose logging is enabled by the user.

Bug: 144695435
Test: Manually verified log level change
Change-Id: I71777bb5f7cb8216bc0ecee27fbaa410c39a6a16
---
 wifi/1.4/default/wifi_chip.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/wifi/1.4/default/wifi_chip.cpp b/wifi/1.4/default/wifi_chip.cpp
index 7685ac61d9..40f73b532a 100644
--- a/wifi/1.4/default/wifi_chip.cpp
+++ b/wifi/1.4/default/wifi_chip.cpp
@@ -1021,6 +1021,12 @@ WifiStatus WifiChip::startLoggingToDebugRingBufferInternal(
             max_interval_in_sec, min_data_size_in_bytes);
     ringbuffer_map_.insert(std::pair<std::string, Ringbuffer>(
         ring_name, Ringbuffer(kMaxBufferSizeBytes)));
+    // if verbose logging enabled, turn up HAL daemon logging as well.
+    if (verbose_level < WifiDebugRingBufferVerboseLevel::VERBOSE) {
+        android::base::SetMinimumLogSeverity(android::base::DEBUG);
+    } else {
+        android::base::SetMinimumLogSeverity(android::base::VERBOSE);
+    }
     return createWifiStatusFromLegacyError(legacy_status);
 }