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

Commit c9d598f5 authored by Bernie Innocenti's avatar Bernie Innocenti Committed by Automerger Merge Worker
Browse files

Merge "Add build flag on platform dependent change" am: b6867372 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/1436851

Change-Id: I513b90336d067614bde04608af3aa2796e20562c
parents 1ad90da9 b6867372

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*/,