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

* commit '174f30b170693054abec89178e3ac7096a3cc06f':
  logd: build breakage in git_master-nova @ 1151709
This commit is contained in:
Mark Salyzyn 2014-05-02 22:58:16 +00:00 committed by Android Git Automerger
commit 593f2040a0

View file

@ -103,7 +103,7 @@ bool LogListener::onDataAvailable(SocketClient *cli) {
// 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;