commit 4d2f024df613dcd10bc589449a14ac918b65a35f
author Dmitry Shmidt <dimitrysh@google.com> Wed Oct 26 23:13:58 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 26 23:13:58 2016 +0000
tree 2f0175d0ee4549495e645a64b581f59750e092f8
parent ace2fea3b0a3b6fa040fe1fd40dc1768927cc7b7
parent a905c234da0dc7cb3558ad6846c902ba7c68d9c3

resolve merge conflicts of d20fe45 to stage-aosp-master
am: a905c234da

Change-Id: I7406c544bdb2a0ffa545640bc6a4e56acbd4e1ef

modules/audio/audio_hw.c

diff --git a/modules/audio/audio_hw.c b/modules/audio/audio_hw.c
index 68b0d3a..35901e4 100644
--- a/modules/audio/audio_hw.c
+++ b/modules/audio/audio_hw.c
@@ -119,7 +119,7 @@
 static ssize_t out_write(struct audio_stream_out *stream, const void* buffer,
                          size_t bytes)
 {
-    ALOGV("out_write: bytes: %d", bytes);
+    ALOGV("out_write: bytes: %zu", bytes);
 
     /* XXX: fake timing for audio output */
     struct stub_stream_out *out = (struct stub_stream_out *)stream;
@@ -242,7 +242,7 @@
 static ssize_t in_read(struct audio_stream_in *stream, void* buffer,
                        size_t bytes)
 {
-    ALOGV("in_read: bytes %d", bytes);
+    ALOGV("in_read: bytes %zu", bytes);
 
     /* XXX: fake timing for audio input */
     struct stub_stream_in *in = (struct stub_stream_in *)stream;