commit 17879bb4df024e9aec307a70db6347922f00199c
author Amy Zhang <amyjojo@google.com> Fri Apr 16 18:41:31 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 16 18:41:31 2021 +0000
tree 76649c4906dba2e5eb8e81f2752e932b8060a1f4
parent ff81743e3165f9a22a3858ea9f7d41851db5d358
parent a1e71116b483e30f7c0dd6d727b0fdea88701d9d

Merge "Correct the TunerFilter local variable naming typo" into sc-dev

services/tuner/TunerFilter.cpp

diff --git a/services/tuner/TunerFilter.cpp b/services/tuner/TunerFilter.cpp
index d3d138d..e957b83 100644
--- a/services/tuner/TunerFilter.cpp
+++ b/services/tuner/TunerFilter.cpp
@@ -57,10 +57,10 @@
         return Status::fromServiceSpecificError(static_cast<int32_t>(Result::UNAVAILABLE));
     }
 
-    MQDesc dvrMQDesc;
+    MQDesc filterMQDesc;
     Result res;
     mFilter->getQueueDesc([&](Result r, const MQDesc& desc) {
-        dvrMQDesc = desc;
+        filterMQDesc = desc;
         res = r;
     });
     if (res != Result::SUCCESS) {
@@ -69,7 +69,7 @@
 
     AidlMQDesc aidlMQDesc;
     unsafeHidlToAidlMQDescriptor<uint8_t, int8_t, SynchronizedReadWrite>(
-                dvrMQDesc,  &aidlMQDesc);
+                filterMQDesc,  &aidlMQDesc);
     *_aidl_return = move(aidlMQDesc);
     return Status::ok();
 }