commit 174f30b170693054abec89178e3ac7096a3cc06f
author Mark Salyzyn <salyzyn@google.com> Fri May 02 22:54:58 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 02 22:54:58 2014 +0000
tree 0875cea264ced2c541f2b7cf43d3bb9f0dcf1098
parent fd5231d7809ce3f84d6fa554d105d5cd658714df
parent dc57f4d93ad2c8dbf2ea1b031328e12fa2fac401

am dc57f4d9: Merge "logd: build breakage in git_master-nova @ 1151709"

* commit 'dc57f4d93ad2c8dbf2ea1b031328e12fa2fac401':
  logd: build breakage in git_master-nova @ 1151709

logd/LogListener.cpp

diff --git a/logd/LogListener.cpp b/logd/LogListener.cpp
index 6ff4d3a..8186cea 100644
--- a/logd/LogListener.cpp
+++ b/logd/LogListener.cpp
@@ -103,7 +103,7 @@
     // truncated message to the logs.
 
     logbuf->log(log_id, realtime, cred->uid, cred->pid, tid, msg,
-        (n <= USHRT_MAX) ? (unsigned short) n : USHRT_MAX);
+        ((size_t) n <= USHRT_MAX) ? (unsigned short) n : USHRT_MAX);
     reader->notifyNewLog();
 
     return true;