commit baff6f8872a8126ca125b09e394e9cf83628350e
author Jooyung Han <jooyung@google.com> Tue Mar 24 06:37:31 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 24 06:37:31 2020 +0000
tree f77e9f18ba0e359c99e72dced842f3e828193fec
parent 1ba6afa3e2214feb277839b6ec2bfa09cc5c1c81
parent a9b79dd7714fd80e40dc69b5cf0ab4fd6789b70e

Merge "use vector<uint8_t> for byte[] in AIDL"

tests/dns_metrics_listener/base_metrics_listener.cpp

diff --git a/tests/dns_metrics_listener/base_metrics_listener.cpp b/tests/dns_metrics_listener/base_metrics_listener.cpp
index c46f093..acd7310 100644
--- a/tests/dns_metrics_listener/base_metrics_listener.cpp
+++ b/tests/dns_metrics_listener/base_metrics_listener.cpp
@@ -45,7 +45,7 @@
 
 ::ndk::ScopedAStatus BaseMetricsListener::onWakeupEvent(
         const std::string& /*prefix*/, int32_t /*uid*/, int32_t /*ethertype*/,
-        int32_t /*ipNextHeader*/, const std::vector<int8_t>& /*dstHw*/,
+        int32_t /*ipNextHeader*/, const std::vector<uint8_t>& /*dstHw*/,
         const std::string& /*srcIp*/, const std::string& /*dstIp*/, int32_t /*srcPort*/,
         int32_t /*dstPort*/, int64_t /*timestampNs*/) {
     // default no-op

tests/dns_metrics_listener/base_metrics_listener.h

diff --git a/tests/dns_metrics_listener/base_metrics_listener.h b/tests/dns_metrics_listener/base_metrics_listener.h
index d50997d..e0b403f 100644
--- a/tests/dns_metrics_listener/base_metrics_listener.h
+++ b/tests/dns_metrics_listener/base_metrics_listener.h
@@ -45,7 +45,7 @@
                                                 int32_t /*uid*/) override;
     virtual ::ndk::ScopedAStatus onWakeupEvent(const std::string& /*prefix*/, int32_t /*uid*/,
                                                int32_t /*ethertype*/, int32_t /*ipNextHeader*/,
-                                               const std::vector<int8_t>& /*dstHw*/,
+                                               const std::vector<uint8_t>& /*dstHw*/,
                                                const std::string& /*srcIp*/,
                                                const std::string& /*dstIp*/, int32_t /*srcPort*/,
                                                int32_t /*dstPort*/,