Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba84a8c3 authored by Anton Hansson's avatar Anton Hansson Committed by Ken Chen
Browse files

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

This reverts commit 10a8ae42.

Reason for revert: broke the master build

Test: treehugger
Merged-In: I3a9d9e67baff80fb59a172f509f6b161779b899e
(cherry picked from commit 4fbc356d)

Change-Id: Ie7f015e545da5b214dabeeb0c0d79fbd429e516e
parent 38d92adb

tests/dns_metrics_listener/base_metrics_listener.cpp

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ namespace metrics { 


::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

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ class BaseMetricsListener : public aidl::android::net::metrics::BnNetdEventListe 
                                                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*/,