commit b708d292d391beb15538cf8919ecec5add464c24
author Mikhail Naganov <mnaganov@google.com> Fri Mar 10 22:06:22 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 10 22:06:22 2023 +0000
tree f26c123dda325a94c47e124228fd0a2ef127cb3e
parent 6b466603c676486cb1331475cfae2f248ac3f4a8
parent b4f8e67e1c1b195f69eace6ba7dbbb4e1569e506

Merge "audio: Add offload reconfiguration event to IBluetoothLe"

audio/aidl/default/main.cpp

diff --git a/audio/aidl/default/main.cpp b/audio/aidl/default/main.cpp
index a861f9d..af71aa8 100644
--- a/audio/aidl/default/main.cpp
+++ b/audio/aidl/default/main.cpp
@@ -41,6 +41,9 @@
     // android::base::SetMinimumLogSeverity(::android::base::VERBOSE);
     ABinderProcess_setThreadPoolMaxThreadCount(16);
 
+    // Guaranteed log for b/210919187 and logd_integration_test
+    LOG(INFO) << "Init for Audio AIDL HAL";
+
     // Make the default config service
     auto config = ndk::SharedRefBase::make<Config>();
     const std::string configName = std::string() + Config::descriptor + "/default";

tv/tuner/aidl/default/Dvr.cpp

diff --git a/tv/tuner/aidl/default/Dvr.cpp b/tv/tuner/aidl/default/Dvr.cpp
index c591d07..c157bdd 100644
--- a/tv/tuner/aidl/default/Dvr.cpp
+++ b/tv/tuner/aidl/default/Dvr.cpp
@@ -164,7 +164,7 @@
         return false;
     }
 
-    mDvrMQ = move(tmpDvrMQ);
+    mDvrMQ = std::move(tmpDvrMQ);
 
     if (EventFlag::createEventFlag(mDvrMQ->getEventFlagWord(), &mDvrEventFlag) != ::android::OK) {
         return false;