summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2016-09-27 14:08:19 -0700
committer Colin Cross <ccross@android.com> 2016-09-30 10:39:42 -0700
commit8bafabf1f69673340c6504037997293322b9fb89 (patch)
treee9bf48b34c38a82f401502212a0168f976986188
parent6c5a17dd2603b282cb0800c262857dc0f3d55f7e (diff)
Fix logging implicit sign conversions
The warnings were being hidden by the use of -isystem to include frameworks/native/include. Bug: 31752268 Test: m -j Merged-in: I2ce11db524ee9d8f846fdf3ed6fb882d5ef57956 Change-Id: I2ce11db524ee9d8f846fdf3ed6fb882d5ef57956
-rw-r--r--libs/gui/BufferQueueConsumer.cpp6
-rw-r--r--libs/gui/BufferQueueProducer.cpp3
2 files changed, 6 insertions, 3 deletions
diff --git a/libs/gui/BufferQueueConsumer.cpp b/libs/gui/BufferQueueConsumer.cpp
index cbc88932ac..f7b83fc34c 100644
--- a/libs/gui/BufferQueueConsumer.cpp
+++ b/libs/gui/BufferQueueConsumer.cpp
@@ -259,7 +259,8 @@ status_t BufferQueueConsumer::acquireBuffer(BufferItem* outBuffer,
// decrease.
mCore->mDequeueCondition.broadcast();
- ATRACE_INT(mCore->mConsumerName.string(), mCore->mQueue.size());
+ ATRACE_INT(mCore->mConsumerName.string(),
+ static_cast<int32_t>(mCore->mQueue.size()));
VALIDATE_CONSISTENCY();
}
@@ -726,7 +727,8 @@ void BufferQueueConsumer::dump(String8& result, const char* prefix) const {
"android.permission.DUMP"), pid, uid)) {
result.appendFormat("Permission Denial: can't dump BufferQueueConsumer "
"from pid=%d, uid=%d\n", pid, uid);
- android_errorWriteWithInfoLog(0x534e4554, "27046057", uid, NULL, 0);
+ android_errorWriteWithInfoLog(0x534e4554, "27046057",
+ static_cast<int32_t>(uid), NULL, 0);
} else {
mCore->dump(result, prefix);
}
diff --git a/libs/gui/BufferQueueProducer.cpp b/libs/gui/BufferQueueProducer.cpp
index 88df6d27d3..e853dfb551 100644
--- a/libs/gui/BufferQueueProducer.cpp
+++ b/libs/gui/BufferQueueProducer.cpp
@@ -899,7 +899,8 @@ status_t BufferQueueProducer::queueBuffer(int slot,
mCore->mTransformHint,
static_cast<uint32_t>(mCore->mQueue.size()));
- ATRACE_INT(mCore->mConsumerName.string(), mCore->mQueue.size());
+ ATRACE_INT(mCore->mConsumerName.string(),
+ static_cast<int32_t>(mCore->mQueue.size()));
// Take a ticket for the callback functions
callbackTicket = mNextCallbackTicket++;