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

Commit 63194520 authored by Vineeta Srivastava's avatar Vineeta Srivastava Committed by Android (Google) Code Review
Browse files

Merge "Revert "Sigh, more vendors linking against hidden APIs.""

parents 0b3a435c 995f45e3
Loading
Loading
Loading
Loading
+0 −13
Original line number Diff line number Diff line
@@ -44,19 +44,6 @@ private:
    char *mParams[NL_PARAMS_MAX];

public:
    // STOPSHIP: remove these deprecated constants once we have updated prebuilts
    const static int NlActionUnknown;
    const static int NlActionAdd;
    const static int NlActionRemove;
    const static int NlActionChange;
    const static int NlActionLinkDown;
    const static int NlActionLinkUp;
    const static int NlActionAddressUpdated;
    const static int NlActionAddressRemoved;
    const static int NlActionRdnss;
    const static int NlActionRouteUpdated;
    const static int NlActionRouteRemoved;

    NetlinkEvent();
    virtual ~NetlinkEvent();

+0 −13
Original line number Diff line number Diff line
@@ -47,19 +47,6 @@ const int LOCAL_NFLOG_PACKET = NFNL_SUBSYS_ULOG << 8 | NFULNL_MSG_PACKET;
#include <netlink/handlers.h>
#include <netlink/msg.h>

// STOPSHIP: remove these deprecated constants once we have updated prebuilts
const int NetlinkEvent::NlActionUnknown = static_cast<int>(Action::kUnknown);
const int NetlinkEvent::NlActionAdd = static_cast<int>(Action::kAdd);
const int NetlinkEvent::NlActionRemove = static_cast<int>(Action::kRemove);
const int NetlinkEvent::NlActionChange = static_cast<int>(Action::kChange);
const int NetlinkEvent::NlActionLinkDown = static_cast<int>(Action::kLinkDown);
const int NetlinkEvent::NlActionLinkUp = static_cast<int>(Action::kLinkUp);
const int NetlinkEvent::NlActionAddressUpdated = static_cast<int>(Action::kAddressUpdated);
const int NetlinkEvent::NlActionAddressRemoved = static_cast<int>(Action::kAddressRemoved);
const int NetlinkEvent::NlActionRdnss = static_cast<int>(Action::kRdnss);
const int NetlinkEvent::NlActionRouteUpdated = static_cast<int>(Action::kRouteUpdated);
const int NetlinkEvent::NlActionRouteRemoved = static_cast<int>(Action::kRouteRemoved);

NetlinkEvent::NetlinkEvent() {
    mAction = Action::kUnknown;
    memset(mParams, 0, sizeof(mParams));