set_mode and set_phone_state now take audio_mode_t

Change-Id: I12a3a5ad6c3cadc6b9de8281f78edfef53908e2d
diff --git a/include/hardware/audio.h b/include/hardware/audio.h
index ed97728..16250fa 100644
--- a/include/hardware/audio.h
+++ b/include/hardware/audio.h
@@ -272,12 +272,11 @@
     int (*set_master_volume)(struct audio_hw_device *dev, float volume);
 
     /**
-     * setMode is called when the audio mode changes. AUDIO_MODE_NORMAL mode
+     * set_mode is called when the audio mode changes. AUDIO_MODE_NORMAL mode
      * is for standard audio playback, AUDIO_MODE_RINGTONE when a ringtone is
      * playing, and AUDIO_MODE_IN_CALL when a call is in progress.
-     * Actual type of mode is enum audio_mode_t defined in <system/audio.h>.
      */
-    int (*set_mode)(struct audio_hw_device *dev, int mode);
+    int (*set_mode)(struct audio_hw_device *dev, audio_mode_t mode);
 
     /* mic mute */
     int (*set_mic_mute)(struct audio_hw_device *dev, bool state);
diff --git a/include/hardware/audio_policy.h b/include/hardware/audio_policy.h
index fc56e5e..6d7fd48 100644
--- a/include/hardware/audio_policy.h
+++ b/include/hardware/audio_policy.h
@@ -99,7 +99,7 @@
 
     /* indicate a change in phone state. Valid phones states are defined
      * by audio_mode_t */
-    void (*set_phone_state)(struct audio_policy *pol, int state);
+    void (*set_phone_state)(struct audio_policy *pol, audio_mode_t state);
 
     /* indicate a change in ringer mode */
     void (*set_ringer_mode)(struct audio_policy *pol, uint32_t mode,