ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vineeta Srivastava 2015-03-23 15:52:21 +00:00 • committed by Android (Google) Code Review
commit 631945200e
2 changed files with 0 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/sysutils/NetlinkEvent.h
View file

@ -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();

13
libsysutils/src/NetlinkEvent.cpp
View file

@ -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));