Merge "recvfrom takes a non-const pointer." am: 96660b37a1 am: 2f4c6e3d0d

am: c41a11a0ee

Change-Id: I48c43a9675568c6b6edbf2a94f51a21770196f2c

libs/common_time/common_time_server.cpp

@@ -615,12 +615,11 @@ bool CommonTimeServer::handlePacket() {
 
     ssize_t recvBytes = recvfrom(
             mSocket, buf, sizeof(buf), 0,
-            reinterpret_cast<const sockaddr *>(&srcAddr), &srcAddrLen);
+            reinterpret_cast<sockaddr *>(&srcAddr), &srcAddrLen);
 
     if (recvBytes < 0) {
-        mBadPktLog.log(ANDROID_LOG_ERROR, LOG_TAG,
-                       "recvfrom failed (res %d, errno %d)",
-                       recvBytes, errno);
+        mBadPktLog.log(ANDROID_LOG_ERROR, LOG_TAG, "recvfrom failed (%s)",
+                       strerror(errno));
         return false;
     }