Use audio_mode_t consistently

Change-Id: I62e23b81e3a411a0d9f012b363373d938827a2e4

diff --git a/audio/audio_hw_hal.cpp b/audio/audio_hw_hal.cpp
index 6810c87..5fdfdb8 100644 (file)
--- a/audio/audio_hw_hal.cpp
+++ b/audio/audio_hw_hal.cpp
@@ -346,10 +346,11 @@ static int adev_set_master_volume(struct audio_hw_device *dev, float volume)
     return ladev->hwif->setMasterVolume(volume);
 }
 
-static int adev_set_mode(struct audio_hw_device *dev, int mode)
+static int adev_set_mode(struct audio_hw_device *dev, audio_mode_t mode)
 {
     struct legacy_audio_device *ladev = to_ladev(dev);
-    return ladev->hwif->setMode(mode);
+    // as this is the legacy API, don't change it to use audio_mode_t instead of int
+    return ladev->hwif->setMode((int) mode);
 }
 
 static int adev_set_mic_mute(struct audio_hw_device *dev, bool state)

diff --git a/audio/audio_policy_hal.cpp b/audio/audio_policy_hal.cpp
index aa70037..f68ea1b 100644 (file)
--- a/audio/audio_policy_hal.cpp
+++ b/audio/audio_policy_hal.cpp
@@ -84,10 +84,11 @@ static audio_policy_dev_state_t ap_get_device_connection_state(
                     device_address);
 }
 
-static void ap_set_phone_state(struct audio_policy *pol, int state)
+static void ap_set_phone_state(struct audio_policy *pol, audio_mode_t state)
 {
     struct legacy_audio_policy *lap = to_lap(pol);
-    lap->apm->setPhoneState(state);
+    // as this is the legacy API, don't change it to use audio_mode_t instead of int
+    lap->apm->setPhoneState((int) state);
 }
 
     /* indicate a change in ringer mode */