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

Commit b6867372 authored by Bernie Innocenti's avatar Bernie Innocenti Committed by Gerrit Code Review
Browse files

Merge "Add build flag on platform dependent change"

parents 2dd12799 c3f5a118

tests/dns_metrics_listener/base_metrics_listener.cpp

+5 −0
Original line number Diff line number Diff line
@@ -45,7 +45,12 @@ namespace metrics { 


::ndk::ScopedAStatus BaseMetricsListener::onWakeupEvent(

        const std::string& /*prefix*/, int32_t /*uid*/, int32_t /*ethertype*/,

// TODO: remove build flag when mainline release branch migrates to Android S (b/168163123).

#ifdef __ANDROID_API_S__

        int32_t /*ipNextHeader*/, const std::vector<uint8_t>& /*dstHw*/,

#else

        int32_t /*ipNextHeader*/, const std::vector<int8_t>& /*dstHw*/,

#endif

        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

+5 −0
Original line number Diff line number Diff line
@@ -45,7 +45,12 @@ 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*/,

// TODO: remove build flag when mainline release branch migrates to Android S (b/168163123).

#ifdef __ANDROID_API_S__

                                               const std::vector<uint8_t>& /*dstHw*/,

#else

                                               const std::vector<int8_t>& /*dstHw*/,

#endif

                                               const std::string& /*srcIp*/,

                                               const std::string& /*dstIp*/, int32_t /*srcPort*/,

                                               int32_t /*dstPort*/,