commit 5ea0c05a1e7d8e664b808aa1bb1efd08fdb2fb13
author Steve Block <steveblock@google.com> Fri Jan 06 19:18:11 2012 +0000
committer Steve Block <steveblock@google.com> Fri Jan 06 19:18:11 2012 +0000
tree 482bdad32dc6955d9946ef277bfb493be3082275
parent 0e76b761a1514d5182675dd7b7d33725f62d6bc5

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)  DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: I8ab66debe4d0c3857a4b80f6f7b6925a352cda87

NetlinkManager.cpp

diff --git a/NetlinkManager.cpp b/NetlinkManager.cpp
index 196945b..73e5599 100644
--- a/NetlinkManager.cpp
+++ b/NetlinkManager.cpp
@@ -63,12 +63,12 @@
     nladdr.nl_groups = groups;
 
     if ((*sock = socket(PF_NETLINK, SOCK_DGRAM, netlinkFamily)) < 0) {
-        LOGE("Unable to create netlink socket: %s", strerror(errno));
+        ALOGE("Unable to create netlink socket: %s", strerror(errno));
         return NULL;
     }
 
     if (setsockopt(*sock, SOL_SOCKET, SO_RCVBUFFORCE, &sz, sizeof(sz)) < 0) {
-        LOGE("Unable to set uevent socket SO_RCVBUFFORCE option: %s", strerror(errno));
+        ALOGE("Unable to set uevent socket SO_RCVBUFFORCE option: %s", strerror(errno));
         close(*sock);
         return NULL;
     }
@@ -80,14 +80,14 @@
     }
 
     if (bind(*sock, (struct sockaddr *) &nladdr, sizeof(nladdr)) < 0) {
-        LOGE("Unable to bind netlink socket: %s", strerror(errno));
+        ALOGE("Unable to bind netlink socket: %s", strerror(errno));
         close(*sock);
         return NULL;
     }
 
     NetlinkHandler *handler = new NetlinkHandler(this, *sock, format);
     if (handler->start()) {
-        LOGE("Unable to start NetlinkHandler: %s", strerror(errno));
+        ALOGE("Unable to start NetlinkHandler: %s", strerror(errno));
         close(*sock);
         return NULL;
     }
@@ -108,7 +108,7 @@
 
     if ((mQuotaHandler = setupSocket(&mQuotaSock, NETLINK_NFLOG,
         NFLOG_QUOTA_GROUP, NetlinkListener::NETLINK_FORMAT_BINARY)) == NULL) {
-        LOGE("Unable to open quota2 logging socket");
+        ALOGE("Unable to open quota2 logging socket");
         // TODO: return -1 once the emulator gets a new kernel.
     }
     return 0;
@@ -118,7 +118,7 @@
     int status = 0;
 
     if (mUeventHandler->stop()) {
-        LOGE("Unable to stop uevent NetlinkHandler: %s", strerror(errno));
+        ALOGE("Unable to stop uevent NetlinkHandler: %s", strerror(errno));
         status = -1;
     }
 
@@ -129,7 +129,7 @@
     mUeventSock = -1;
 
     if (mRouteHandler->stop()) {
-        LOGE("Unable to stop route NetlinkHandler: %s", strerror(errno));
+        ALOGE("Unable to stop route NetlinkHandler: %s", strerror(errno));
         status = -1;
     }
 
@@ -141,7 +141,7 @@
 
     if (mQuotaHandler) {
         if (mQuotaHandler->stop()) {
-            LOGE("Unable to stop quota NetlinkHandler: %s", strerror(errno));
+            ALOGE("Unable to stop quota NetlinkHandler: %s", strerror(errno));
             status = -1;
         }