Merge "Fix 64-bit build failure." am: aff3239

am: dc868bb

* commit 'dc868bbc88a4b2d9a7b584c05a18b989f2779e38':
  Fix 64-bit build failure.

Change-Id: I94ef98339b4203b46df54c6b9c2bfebd70c71989

diff --git a/brillo/audio/audioservice/test/brillo_audio_manager_test.cpp b/brillo/audio/audioservice/test/brillo_audio_manager_test.cpp
index a102c6c..85f0504 100644 (file)
--- a/brillo/audio/audioservice/test/brillo_audio_manager_test.cpp
+++ b/brillo/audio/audioservice/test/brillo_audio_manager_test.cpp
@@ -70,7 +70,7 @@ TEST_F(BrilloAudioManagerTest, NewWithBAS) {
 
 TEST_F(BrilloAudioManagerTest, GetDevicesInvalidParams) {
   auto bam = GetValidManager();
-  size_t num_devices;
+  unsigned int num_devices;
   EXPECT_EQ(BAudioManager_getDevices(nullptr, 1, nullptr, 0, &num_devices),
             EINVAL);
   EXPECT_EQ(BAudioManager_getDevices(bam, 1, nullptr, 0, nullptr), EINVAL);
@@ -80,7 +80,7 @@ TEST_F(BrilloAudioManagerTest, GetDevicesInvalidParams) {
 
 TEST_F(BrilloAudioManagerTest, GetDevicesNullArrNoDevices) {
   auto bam = GetValidManager();
-  size_t num_devices = -1;
+  unsigned int num_devices = -1;
   EXPECT_CALL(*bas_.get(), GetDevices(1, _)).WillOnce(Return(Status::ok()));
   EXPECT_EQ(BAudioManager_getDevices(bam, 1, nullptr, 0, &num_devices), 0);
   EXPECT_EQ(num_devices, 0);
@@ -239,7 +239,7 @@ TEST_F(BrilloAudioManagerTest, UnregisterCallback) {
 
 TEST_F(BrilloAudioManagerTest, GetDevicesBASDies) {
   auto bam = GetValidManager();
-  size_t num_devices = -1;
+  unsigned int num_devices = -1;
   binder_wrapper()->NotifyAboutBinderDeath(bas_);
   EXPECT_EQ(BAudioManager_getDevices(bam, 1, nullptr, 0, &num_devices),
             ECONNABORTED);