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

Commit e134505a authored by Anton Hansson's avatar Anton Hansson Committed by Android (Google) Code Review
Browse files

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

parents f61458d6 4fbc356d
Loading
Loading
Loading
Loading
+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
+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*/,