commit c38e7baa4f7f0ee69ba494a4624d1f6dd3e21bec
author Glenn Kasten <gkasten@google.com> Tue Jan 17 07:27:35 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 17 07:27:35 2012 -0800
tree 6d4a2744a6fcd84b435a3c8a24634037ffde98d6
parent 80eed7f0964eab6e622dbf2449be47e410a4fa0d
parent a26cbac8a0f71ba59a89e250caaa1155f0179751

Merge "Use size_t for frame size"

include/hardware/audio_policy.h

diff --git a/include/hardware/audio_policy.h b/include/hardware/audio_policy.h
index fc56e5e..add14f8 100644
--- a/include/hardware/audio_policy.h
+++ b/include/hardware/audio_policy.h
@@ -215,7 +215,7 @@
     int (*set_effect_enabled)(struct audio_policy *pol, int id, bool enabled);
 
     bool (*is_stream_active)(const struct audio_policy *pol,
-                             int stream,
+                             audio_stream_type_t stream,
                              uint32_t in_past_ms);
 
     /* dump state */

include/hardware/gralloc.h

diff --git a/include/hardware/gralloc.h b/include/hardware/gralloc.h
index f8beb5e..2dbd1fa 100644
--- a/include/hardware/gralloc.h
+++ b/include/hardware/gralloc.h
@@ -258,4 +258,4 @@
 
 __END_DECLS
 
-#endif  // ANDROID_ALLOC_INTERFACE_H
+#endif  // ANDROID_GRALLOC_INTERFACE_H

modules/audio/audio_policy.c

diff --git a/modules/audio/audio_policy.c b/modules/audio/audio_policy.c
index 409f0a1..3313d48 100644
--- a/modules/audio/audio_policy.c
+++ b/modules/audio/audio_policy.c
@@ -201,7 +201,7 @@
     return -ENOSYS;
 }
 
-static bool ap_is_stream_active(const struct audio_policy *pol, int stream,
+static bool ap_is_stream_active(const struct audio_policy *pol, audio_stream_type_t stream,
                                 uint32_t in_past_ms)
 {
     return false;