[UTC][sound-manager][ACR-843][add new API to get device list]

Change-Id: If054062ca44e5b1cdf97fda339f27410bac7db8d

diff --git a/src/ctc/sound-manager/CTs-sound-manager.c b/src/ctc/sound-manager/CTs-sound-manager.c
index 5beda4b9dff8adaed5a7b65a8d81c145f857fe22..4e874cfe7bbf774375dfaa9f9bbe2cdae26b8699 100755 (executable)
--- a/src/ctc/sound-manager/CTs-sound-manager.c
+++ b/src/ctc/sound-manager/CTs-sound-manager.c
@@ -70,7 +70,7 @@ void CTs_sound_manager_cleanup(void)
 * @reviewer                    SRID(gupta.sanjay)
 * @type                        auto
 * @scenario                    Gets the list of audio output devices connected
-* @apicovered          Sound_manager_get_current_device_list
+* @apicovered          sound_manager_get_device_list
 * @passcase                    When API return SOUND_MANAGER_ERROR_NONE and the list of audio output devices is not NULL
 * @failcase                    When API doesn't return SOUND_MANAGER_ERROR_NONE or the list of audio output devices is NULL
 * @precondition                None
@@ -83,18 +83,18 @@ int CTc_sound_manager_get_audio_output_device_list_p(void)
        sound_device_list_h audioOutDeviceList = NULL;
        sound_device_mask_e e_device_mask = SOUND_DEVICE_IO_DIRECTION_OUT_MASK ;                /*< Mask for output devices */
 
-       int nRetVal = sound_manager_get_current_device_list(e_device_mask, &audioOutDeviceList);
+       int nRetVal = sound_manager_get_device_list(e_device_mask, &audioOutDeviceList);
 
        if( nRetVal == SOUND_MANAGER_ERROR_NO_DATA )
        {
                return 0;
        }
 
-       PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRetVal, "sound_manager_get_current_device_list", SoundManagerGetError(nRetVal))
+       PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRetVal, "sound_manager_get_device_list", SoundManagerGetError(nRetVal))
 
        if ( audioOutDeviceList == NULL )
        {
-               FPRINTF("[Line : %d][%s] sound_manager_get_current_device_list failed, device list returned is NULL\\n", __LINE__, API_NAMESPACE);
+               FPRINTF("[Line : %d][%s] sound_manager_get_device_list failed, device list returned is NULL\\n", __LINE__, API_NAMESPACE);
                return 1;
        }
 

diff --git a/src/itc/sound-manager/ITs-sound-manager-device.c b/src/itc/sound-manager/ITs-sound-manager-device.c
index 6845da8f474ec666756df77114be5b2a965a2871..4ef7e0443fb01244ac50543cbc926258c1ac443a 100755 (executable)
--- a/src/itc/sound-manager/ITs-sound-manager-device.c
+++ b/src/itc/sound-manager/ITs-sound-manager-device.c
@@ -137,17 +137,11 @@ int ITc_sound_manager_get_current_device_list_p(void)
        {
                e_device_mask = arrSoundDeviceMask[nEnumCount];
                nRet = sound_manager_get_current_device_list(e_device_mask, &deviceList);
-               if(!(deviceList == NULL && nRet == SOUND_MANAGER_ERROR_NO_DATA))
+               if(nRet != SOUND_MANAGER_ERROR_NO_DATA)
                {
                        PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_get_current_device_list", SoundManagerGetError(nRet));
                        CHECK_HANDLE(deviceList, "sound_manager_get_current_device_list");
                }
-               if(deviceList != NULL)
-               {
-                       nRet = sound_manager_free_device_list(deviceList);
-                       PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_free_device_list", SoundManagerGetError(nRet));
-                       deviceList = NULL;
-               }
        }
 
        return 0;
@@ -200,7 +194,7 @@ int ITc_sound_manager_get_current_device_list_p(void)
 * @description                 To get the next item of the device list and free it
 * @scenario                            Get the list of devices connected\n
 *                                              Get the next item of the device list and free it
-* @apicovered                  sound_manager_get_current_device_list, sound_manager_get_next_device,sound_manager_free_device_list
+* @apicovered                  sound_manager_get_device_list, sound_manager_get_next_device,sound_manager_free_device_list
 * @passcase                            When API return SOUND_MANAGER_ERROR_NONE
 * @failcase                            When API not return SOUND_MANAGER_ERROR_NONE
 * @precondition                        None
@@ -214,14 +208,14 @@ int ITc_sound_manager_get_next_device_free_device_p(void)
        sound_device_mask_e e_device_mask = SOUND_DEVICE_ALL_MASK;
        sound_device_h hDevice = NULL;
 
-       int nRet = sound_manager_get_current_device_list(e_device_mask, &deviceList);
+       int nRet = sound_manager_get_device_list(e_device_mask, &deviceList);
        if (nRet == SOUND_MANAGER_ERROR_NO_DATA)
        {
-               FPRINTF("\\n[Line : %d][%s]sound_manager_get_current_device_list error returned = %s . So leaving test",__LINE__, API_NAMESPACE, SoundManagerGetError(nRet));
+               FPRINTF("\\n[Line : %d][%s]sound_manager_get_device_list error returned = %s . So leaving test",__LINE__, API_NAMESPACE, SoundManagerGetError(nRet));
                return 0;               
        }
-       PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_get_current_device_list", SoundManagerGetError(nRet));
-       CHECK_HANDLE(deviceList, "sound_manager_get_current_device_list");
+       PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_get_device_list", SoundManagerGetError(nRet));
+       CHECK_HANDLE(deviceList, "sound_manager_get_device_list");
 
        nRet = sound_manager_get_next_device(deviceList, &hDevice);
        if (nRet == SOUND_MANAGER_ERROR_NO_DATA)
@@ -250,7 +244,7 @@ int ITc_sound_manager_get_next_device_free_device_p(void)
 * @description                 To get the next item of the device list
 * @scenario                            Get the list of devices connected\n
 *                                              Get the previous item of the device list
-* @apicovered                  sound_manager_get_current_device_list, sound_manager_get_next_device, sound_manager_get_prev_device
+* @apicovered                  sound_manager_get_device_list, sound_manager_get_next_device, sound_manager_get_prev_device
 * @passcase                            When API return SOUND_MANAGER_ERROR_NONE
 * @failcase                            When API not return SOUND_MANAGER_ERROR_NONE
 * @precondition                        None
@@ -264,15 +258,15 @@ int ITc_sound_manager_get_prev_device_p(void)
        sound_device_mask_e e_device_mask = SOUND_DEVICE_ALL_MASK;
        sound_device_h hDevice = NULL;
 
-       int nRet = sound_manager_get_current_device_list(e_device_mask, &deviceList);
+       int nRet = sound_manager_get_device_list(e_device_mask, &deviceList);
        if (nRet == SOUND_MANAGER_ERROR_NO_DATA)
        {
-               FPRINTF("\\n[Line : %d][%s]sound_manager_get_current_device_list error returned = %s . So leaving test",__LINE__, API_NAMESPACE, SoundManagerGetError(nRet));
+               FPRINTF("\\n[Line : %d][%s]sound_manager_get_device_list error returned = %s . So leaving test",__LINE__, API_NAMESPACE, SoundManagerGetError(nRet));
                deviceList = NULL;
                return 0;
        }
-       PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_get_current_device_list", SoundManagerGetError(nRet));
-       CHECK_HANDLE(deviceList, "sound_manager_get_current_device_list");
+       PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_get_device_list", SoundManagerGetError(nRet));
+       CHECK_HANDLE(deviceList, "sound_manager_get_device_list");
 
        //to come on root node a call is required
        nRet = sound_manager_get_next_device(deviceList, &hDevice);
@@ -331,7 +325,7 @@ int ITc_sound_manager_get_prev_device_p(void)
 * @description                 To get the next item of the device list
 * @scenario                            Get the list of devices connected\n
 *                                              Get the previous item of the device list
-* @apicovered                  sound_manager_get_current_device_list, sound_manager_get_next_device, sound_manager_get_prev_device
+* @apicovered                  sound_manager_get_device_list, sound_manager_get_next_device, sound_manager_get_prev_device
 * @passcase                            When API return SOUND_MANAGER_ERROR_NONE
 * @failcase                            When API not return SOUND_MANAGER_ERROR_NONE
 * @precondition                        None
@@ -345,15 +339,15 @@ int ITc_sound_manager_get_prev_device_p(void)
        sound_device_mask_e e_device_mask = SOUND_DEVICE_ALL_MASK;
        sound_device_h hDevice = NULL;
 
-       int nRet = sound_manager_get_current_device_list(e_device_mask, &deviceList);
+       int nRet = sound_manager_get_device_list(e_device_mask, &deviceList);
        if (nRet == SOUND_MANAGER_ERROR_NO_DATA)
        {
-               FPRINTF("\\n[Line : %d][%s]sound_manager_get_current_device_list error returned = %s . So leaving test",__LINE__, API_NAMESPACE, SoundManagerGetError(nRet));
+               FPRINTF("\\n[Line : %d][%s]sound_manager_get_device_list error returned = %s . So leaving test",__LINE__, API_NAMESPACE, SoundManagerGetError(nRet));
                deviceList = NULL;
                return 0;
        }
-       PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_get_current_device_list", SoundManagerGetError(nRet));
-       CHECK_HANDLE(deviceList, "sound_manager_get_current_device_list");
+       PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_get_device_list", SoundManagerGetError(nRet));
+       CHECK_HANDLE(deviceList, "sound_manager_get_device_list");
 
        //to come on root node a call is required
        nRet = sound_manager_get_next_device(deviceList, &hDevice);
@@ -407,7 +401,7 @@ int ITc_sound_manager_get_prev_device_p(void)
 * @scenario                            Get the list of devices connected\n
 *                                              Get the next item of the device list\n
 *                                              Get the type of the device
-* @apicovered                  sound_manager_get_current_device_list, sound_manager_get_next_device, sound_manager_get_device_type
+* @apicovered                  sound_manager_get_device_list, sound_manager_get_next_device, sound_manager_get_device_type
 * @passcase                            When API return SOUND_MANAGER_ERROR_NONE
 * @failcase                            When API not return SOUND_MANAGER_ERROR_NONE
 * @precondition                        None
@@ -421,19 +415,19 @@ int ITc_sound_manager_get_device_type_p(void)
        sound_device_h hDevice = NULL;
        sound_device_type_e eType = -1;
        #if defined(MOBILE) ||  defined(COMMON_IOT) || defined(WEARABLE) //Starts MOBILE or  COMMON_IOT and WEARABLE
-       int nRet = sound_manager_get_current_device_list(SOUND_DEVICE_IO_DIRECTION_IN_MASK, &deviceList);
+       int nRet = sound_manager_get_device_list(SOUND_DEVICE_IO_DIRECTION_IN_MASK, &deviceList);
        #endif//MOBILE or COMMON_IOT or WEARABLE
        #ifdef TV       //Starts TV
-       int nRet = sound_manager_get_current_device_list(SOUND_DEVICE_IO_DIRECTION_OUT_MASK, &deviceList);
+       int nRet = sound_manager_get_device_list(SOUND_DEVICE_IO_DIRECTION_OUT_MASK, &deviceList);
        #endif  //TV    //End TV
        
        if (nRet == SOUND_MANAGER_ERROR_NO_DATA)
        {
-               FPRINTF("\\n[Line : %d][%s]sound_manager_get_current_device_list error returned = %s . So leaving test",__LINE__, API_NAMESPACE, SoundManagerGetError(nRet));
+               FPRINTF("\\n[Line : %d][%s]sound_manager_get_device_list error returned = %s . So leaving test",__LINE__, API_NAMESPACE, SoundManagerGetError(nRet));
                return 0;               
        }
-       PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_get_current_device_list", SoundManagerGetError(nRet));
-       CHECK_HANDLE(deviceList, "sound_manager_get_current_device_list");
+       PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_get_device_list", SoundManagerGetError(nRet));
+       CHECK_HANDLE(deviceList, "sound_manager_get_device_list");
 
        nRet = sound_manager_get_next_device(deviceList, &hDevice);
        if (nRet == SOUND_MANAGER_ERROR_NO_DATA)
@@ -471,7 +465,7 @@ int ITc_sound_manager_get_device_type_p(void)
 * @scenario                            Get the list of devices connected\n
 *                                              Get the next item of the device list\n
 *                                              Get the io direction of the device
-* @apicovered                  sound_manager_get_current_device_list, sound_manager_get_next_device, sound_manager_get_device_io_direction
+* @apicovered                  sound_manager_get_device_list, sound_manager_get_next_device, sound_manager_get_device_io_direction
 * @passcase                            When API return SOUND_MANAGER_ERROR_NONE
 * @failcase                            When API not return SOUND_MANAGER_ERROR_NONE
 * @precondition                        None
@@ -486,19 +480,19 @@ int ITc_sound_manager_get_device_io_direction_p(void)
        sound_device_io_direction_e eIoDirection = -1;
 
        #if defined(MOBILE) ||  defined(COMMON_IOT) || defined(WEARABLE) //Starts MOBILE or  COMMON_IOT and WEARABLE
-       int nRet = sound_manager_get_current_device_list(SOUND_DEVICE_IO_DIRECTION_IN_MASK, &deviceList);
+       int nRet = sound_manager_get_device_list(SOUND_DEVICE_IO_DIRECTION_IN_MASK, &deviceList);
        #endif//MOBILE or COMMON_IOT or WEARABLE
        #ifdef TV       //Starts TV
-       int nRet = sound_manager_get_current_device_list(SOUND_DEVICE_IO_DIRECTION_OUT_MASK, &deviceList);
+       int nRet = sound_manager_get_device_list(SOUND_DEVICE_IO_DIRECTION_OUT_MASK, &deviceList);
        #endif  //TV    //End TV
        
        if (nRet == SOUND_MANAGER_ERROR_NO_DATA)
        {
-               FPRINTF("\\n[Line : %d][%s]sound_manager_get_current_device_list error returned = %s . So leaving test",__LINE__, API_NAMESPACE, SoundManagerGetError(nRet));
+               FPRINTF("\\n[Line : %d][%s]sound_manager_get_device_list error returned = %s . So leaving test",__LINE__, API_NAMESPACE, SoundManagerGetError(nRet));
                return 0;               
        }
-       PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_get_current_device_list", SoundManagerGetError(nRet));
-       CHECK_HANDLE(deviceList, "sound_manager_get_current_device_list");
+       PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_get_device_list", SoundManagerGetError(nRet));
+       CHECK_HANDLE(deviceList, "sound_manager_get_device_list");
 
        nRet = sound_manager_get_next_device(deviceList, &hDevice);
        if (nRet == SOUND_MANAGER_ERROR_NO_DATA)
@@ -536,7 +530,7 @@ int ITc_sound_manager_get_device_io_direction_p(void)
 * @scenario                            Get the list of devices connected\n
 *                                              Get the next item of the device list\n
 *                                              Get the id of the device
-* @apicovered                  sound_manager_get_current_device_list, sound_manager_get_next_device, sound_manager_get_device_id
+* @apicovered                  sound_manager_get_device_list, sound_manager_get_next_device, sound_manager_get_device_id
 * @passcase                            When API return SOUND_MANAGER_ERROR_NONE
 * @failcase                            When API not return SOUND_MANAGER_ERROR_NONE
 * @precondition                        None
@@ -550,19 +544,19 @@ int ITc_sound_manager_get_device_id_p(void)
        sound_device_h hDevice = NULL;
        int nId = -1;
        #if defined(MOBILE) ||  defined(COMMON_IOT) || defined(WEARABLE) //Starts MOBILE or  COMMON_IOT and WEARABLE
-       int nRet = sound_manager_get_current_device_list(SOUND_DEVICE_IO_DIRECTION_IN_MASK, &deviceList);
+       int nRet = sound_manager_get_device_list(SOUND_DEVICE_IO_DIRECTION_IN_MASK, &deviceList);
        #endif//MOBILE or COMMON_IOT or WEARABLE
        #ifdef TV       //Starts TV
-       int nRet = sound_manager_get_current_device_list(SOUND_DEVICE_IO_DIRECTION_OUT_MASK, &deviceList);
+       int nRet = sound_manager_get_device_list(SOUND_DEVICE_IO_DIRECTION_OUT_MASK, &deviceList);
        #endif  //TV    //End TV
        
        if (nRet == SOUND_MANAGER_ERROR_NO_DATA)
        {
-               FPRINTF("\\n[Line : %d][%s]sound_manager_get_current_device_list error returned = %s . So leaving test",__LINE__, API_NAMESPACE, SoundManagerGetError(nRet));
+               FPRINTF("\\n[Line : %d][%s]sound_manager_get_device_list error returned = %s . So leaving test",__LINE__, API_NAMESPACE, SoundManagerGetError(nRet));
                return 0;               
        }
-       PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_get_current_device_list", SoundManagerGetError(nRet));
-       CHECK_HANDLE(deviceList, "sound_manager_get_current_device_list");
+       PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_get_device_list", SoundManagerGetError(nRet));
+       CHECK_HANDLE(deviceList, "sound_manager_get_device_list");
 
        nRet = sound_manager_get_next_device(deviceList, &hDevice);
        if (nRet == SOUND_MANAGER_ERROR_NO_DATA)
@@ -599,7 +593,7 @@ int ITc_sound_manager_get_device_id_p(void)
 * @scenario                            Get the list of devices connected\n
 *                                              Get the next item of the device list\n
 *                                              Get the name of the device
-* @apicovered                  sound_manager_get_current_device_list, sound_manager_get_next_device, sound_manager_get_device_name
+* @apicovered                  sound_manager_get_device_list, sound_manager_get_next_device, sound_manager_get_device_name
 * @passcase                            When API return SOUND_MANAGER_ERROR_NONE
 * @failcase                            When API not return SOUND_MANAGER_ERROR_NONE
 * @precondition                        None
@@ -613,19 +607,19 @@ int ITc_sound_manager_get_device_name_p(void)
        sound_device_h hDevice = NULL;
        char *pszName = NULL;
        #if defined(MOBILE) ||  defined(COMMON_IOT) || defined(WEARABLE) //Starts MOBILE or  COMMON_IOT and WEARABLE
-       int nRet = sound_manager_get_current_device_list(SOUND_DEVICE_IO_DIRECTION_IN_MASK, &deviceList);
+       int nRet = sound_manager_get_device_list(SOUND_DEVICE_IO_DIRECTION_IN_MASK, &deviceList);
        #endif//MOBILE or COMMON_IOT or WEARABLE
        #ifdef TV       //Starts TV
-       int nRet = sound_manager_get_current_device_list(SOUND_DEVICE_IO_DIRECTION_OUT_MASK, &deviceList);
+       int nRet = sound_manager_get_device_list(SOUND_DEVICE_IO_DIRECTION_OUT_MASK, &deviceList);
        #endif  //TV    //End TV
        
        if (nRet == SOUND_MANAGER_ERROR_NO_DATA)
        {
-               FPRINTF("\\n[Line : %d][%s]sound_manager_get_current_device_list error returned = %s . So leaving test",__LINE__, API_NAMESPACE, SoundManagerGetError(nRet));
+               FPRINTF("\\n[Line : %d][%s]sound_manager_get_device_list error returned = %s . So leaving test",__LINE__, API_NAMESPACE, SoundManagerGetError(nRet));
                return 0;               
        }
-       PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_get_current_device_list", SoundManagerGetError(nRet));
-       CHECK_HANDLE(deviceList, "sound_manager_get_current_device_list");
+       PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_get_device_list", SoundManagerGetError(nRet));
+       CHECK_HANDLE(deviceList, "sound_manager_get_device_list");
 
        nRet = sound_manager_get_next_device(deviceList, &hDevice);
        if (nRet == SOUND_MANAGER_ERROR_NO_DATA)
@@ -654,7 +648,7 @@ int ITc_sound_manager_get_device_name_p(void)
 * @scenario                            Get the list of devices connected\n
 *                                              Get the next item of the device list\n
 *                                              Get the state of the device
-* @apicovered                  sound_manager_get_current_device_list, sound_manager_get_next_device, sound_manager_get_device_state
+* @apicovered                  sound_manager_get_device_list, sound_manager_get_next_device, sound_manager_get_device_state
 * @passcase                            When API return SOUND_MANAGER_ERROR_NONE
 * @failcase                            When API not return SOUND_MANAGER_ERROR_NONE
 * @precondition                        None
@@ -669,19 +663,19 @@ int ITc_sound_manager_get_device_state_p(void)
        sound_device_state_e eState = -1;
 
        #if defined(MOBILE) ||  defined(COMMON_IOT) || defined(WEARABLE) //Starts MOBILE or  COMMON_IOT and WEARABLE
-       int nRet = sound_manager_get_current_device_list(SOUND_DEVICE_IO_DIRECTION_IN_MASK, &deviceList);
+       int nRet = sound_manager_get_device_list(SOUND_DEVICE_IO_DIRECTION_IN_MASK, &deviceList);
        #endif//MOBILE or COMMON_IOT or WEARABLE
        #ifdef TV       //Starts TV
-       int nRet = sound_manager_get_current_device_list(SOUND_DEVICE_IO_DIRECTION_OUT_MASK, &deviceList);
+       int nRet = sound_manager_get_device_list(SOUND_DEVICE_IO_DIRECTION_OUT_MASK, &deviceList);
        #endif  //TV    //End TV
        
        if (nRet == SOUND_MANAGER_ERROR_NO_DATA)
        {
-               FPRINTF("\\n[Line : %d][%s]sound_manager_get_current_device_list error returned = %s . So leaving test",__LINE__, API_NAMESPACE, SoundManagerGetError(nRet));
+               FPRINTF("\\n[Line : %d][%s]sound_manager_get_device_list error returned = %s . So leaving test",__LINE__, API_NAMESPACE, SoundManagerGetError(nRet));
                return 0;               
        }
-       PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_get_current_device_list", SoundManagerGetError(nRet));
-       CHECK_HANDLE(deviceList, "sound_manager_get_current_device_list");
+       PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_get_device_list", SoundManagerGetError(nRet));
+       CHECK_HANDLE(deviceList, "sound_manager_get_device_list");
 
        nRet = sound_manager_get_next_device(deviceList, &hDevice);
        if (nRet == SOUND_MANAGER_ERROR_NO_DATA)
@@ -843,19 +837,19 @@ int ITc_sound_manager_get_device_bluetooth_avail_mode_p(void)
        int navailMode = -1;
 
        #if defined(MOBILE) ||  defined(COMMON_IOT) || defined(WEARABLE)
-       int nRet = sound_manager_get_current_device_list(SOUND_DEVICE_IO_DIRECTION_IN_MASK, &deviceList);
+       int nRet = sound_manager_get_device_list(SOUND_DEVICE_IO_DIRECTION_IN_MASK, &deviceList);
        #endif
        #ifdef TV
-       int nRet = sound_manager_get_current_device_list(SOUND_DEVICE_IO_DIRECTION_OUT_MASK, &deviceList);
+       int nRet = sound_manager_get_device_list(SOUND_DEVICE_IO_DIRECTION_OUT_MASK, &deviceList);
        #endif
        
        if (nRet == SOUND_MANAGER_ERROR_NO_DATA)
        {
-               FPRINTF("\\n[Line : %d][%s]sound_manager_get_current_device_list error returned = %s . So leaving test",__LINE__, API_NAMESPACE, SoundManagerGetError(nRet));
+               FPRINTF("\\n[Line : %d][%s]sound_manager_get_device_list error returned = %s . So leaving test",__LINE__, API_NAMESPACE, SoundManagerGetError(nRet));
                return 0;               
        }
-       PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_get_current_device_list", SoundManagerGetError(nRet));
-       CHECK_HANDLE(deviceList, "sound_manager_get_current_device_list");
+       PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_get_device_list", SoundManagerGetError(nRet));
+       CHECK_HANDLE(deviceList, "sound_manager_get_device_list");
 
        nRet = sound_manager_get_next_device(deviceList, &hDevice);
        if (nRet == SOUND_MANAGER_ERROR_NO_DATA)

diff --git a/src/itc/sound-manager/ITs-sound-manager-session.c b/src/itc/sound-manager/ITs-sound-manager-session.c
index 11817c9d137671cd5ed3ffa2eb50f9de4c6c2b2b..209be167e502d20d154e7ae8eba21d7a6c859f00 100755 (executable)
--- a/src/itc/sound-manager/ITs-sound-manager-session.c
+++ b/src/itc/sound-manager/ITs-sound-manager-session.c
@@ -100,7 +100,7 @@ void ITs_sound_manager_session_cleanup(void)
 * @type                                auto
 * @description                 Set and Get the mode of the voip sound session
 * @scenario                            Set session type. Set voip session type and get voip session type
-* @apicovered                  sound_manager_set_session_type, sound_manager_set_voip_session_mode, sound_manager_get_voip_session_mode, sound_manager_get_current_device_list
+* @apicovered                  sound_manager_set_session_type, sound_manager_set_voip_session_mode, sound_manager_get_voip_session_mode, sound_manager_get_device_list
 *                                              sound_manager_get_next_device and sound_manager_get_device_type
 * @passcase                            When API sound_manager_set_session_type and sound_manager_get_session_type return SOUND_MANAGER_ERROR_NONE and set get modes matches
 * @failcase                            When API sound_manager_set_session_type or sound_manager_get_session_type does not return SOUND_MANAGER_ERROR_NONE or set get modes mismatches
@@ -138,13 +138,13 @@ int ITc_sound_manager_set_get_voip_session_mode_p(void)
                return 1;
        }
        
-       nRet = sound_manager_get_current_device_list(SOUND_DEVICE_ALL_MASK, &list);
+       nRet = sound_manager_get_device_list(SOUND_DEVICE_ALL_MASK, &list);
        if (nRet == SOUND_MANAGER_ERROR_NO_DATA)
        {
-               FPRINTF("\\n[Line : %d][%s]sound_manager_get_current_device_list error returned = %s . So leaving test",__LINE__, API_NAMESPACE, SoundManagerGetError(nRet));
+               FPRINTF("\\n[Line : %d][%s]sound_manager_get_device_list error returned = %s . So leaving test",__LINE__, API_NAMESPACE, SoundManagerGetError(nRet));
                return 0;               
        }
-       PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_get_current_device_list", SoundManagerGetError(nRet));
+       PRINT_RESULT(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_get_device_list", SoundManagerGetError(nRet));
        
        while(sound_manager_get_next_device(list, &device) == SOUND_MANAGER_ERROR_NONE)
        {

diff --git a/src/itc/sound-manager/ITs-sound-manager-stream.c b/src/itc/sound-manager/ITs-sound-manager-stream.c
index 470ec7fb0df350fa4763a1f727d550882ddf8522..a255fa8b19cb0a5de49145284f5464bcb7cee0b8 100755 (executable)
--- a/src/itc/sound-manager/ITs-sound-manager-stream.c
+++ b/src/itc/sound-manager/ITs-sound-manager-stream.c
@@ -198,16 +198,16 @@ int ITc_sound_manager_add_remove_device_for_stream_routing_p(void)
 
        CHECK_HANDLE(stream_info, "sound_manager_create_stream_information");
 
-       nRet = sound_manager_get_current_device_list(SOUND_DEVICE_IO_DIRECTION_IN_MASK, &deviceList);
+       nRet = sound_manager_get_device_list(SOUND_DEVICE_IO_DIRECTION_IN_MASK, &deviceList);
        if (nRet == SOUND_MANAGER_ERROR_NO_DATA)
        {
-               FPRINTF("\\n[Line : %d][%s]sound_manager_get_current_device_list error returned = %s . So leaving test",__LINE__, API_NAMESPACE, SoundManagerGetError(nRet));
+               FPRINTF("\\n[Line : %d][%s]sound_manager_get_device_list error returned = %s . So leaving test",__LINE__, API_NAMESPACE, SoundManagerGetError(nRet));
                sound_manager_destroy_stream_information(stream_info);
                return 0;               
        }
-       PRINT_RESULT_CLEANUP(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_get_current_device_list", SoundManagerGetError(nRet), sound_manager_destroy_stream_information(stream_info));
+       PRINT_RESULT_CLEANUP(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_get_device_list", SoundManagerGetError(nRet), sound_manager_destroy_stream_information(stream_info));
 
-       CHECK_HANDLE(deviceList, "sound_manager_get_current_device_list");
+       CHECK_HANDLE(deviceList, "sound_manager_get_device_list");
 
        nRet = sound_manager_get_next_device(deviceList, &device);
        if (nRet == SOUND_MANAGER_ERROR_NO_DATA)
@@ -267,8 +267,8 @@ int ITc_sound_manager_apply_stream_routing_p(void)
 
        CHECK_HANDLE(stream_info, "sound_manager_create_stream_information");
 
-       nRet = sound_manager_get_current_device_list(SOUND_DEVICE_ALL_MASK, &device_list);
-       PRINT_RESULT_CLEANUP(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_get_current_device_list", SoundManagerGetError(nRet), sound_manager_destroy_stream_information(stream_info));
+       nRet = sound_manager_get_device_list(SOUND_DEVICE_ALL_MASK, &device_list);
+       PRINT_RESULT_CLEANUP(SOUND_MANAGER_ERROR_NONE, nRet, "sound_manager_get_device_list", SoundManagerGetError(nRet), sound_manager_destroy_stream_information(stream_info));
 
        while (sound_manager_get_next_device(device_list, &device) == SOUND_MANAGER_ERROR_NONE) {
                nRet = sound_manager_get_device_type(device, &type);

diff --git a/src/utc/sound-manager/public.list b/src/utc/sound-manager/public.list
index 1ad6724f66340b3b921ccf7f66e8e69cee205758..4943a573f4eb5d9d57df338c8ab0344161dab509 100755 (executable)
--- a/src/utc/sound-manager/public.list
+++ b/src/utc/sound-manager/public.list
@@ -15,6 +15,7 @@ sound_manager_unset_current_sound_type
 sound_manager_unset_session_interrupted_cb
 sound_manager_unset_volume_changed_cb
 sound_manager_get_current_device_list
+sound_manager_get_device_list
 sound_manager_get_next_device
 sound_manager_get_prev_device
 sound_manager_get_device_type

diff --git a/src/utc/sound-manager/tct-sound-manager-core_common_iot.h b/src/utc/sound-manager/tct-sound-manager-core_common_iot.h
index 97b6223c8df043853b8aa2e52dc6b4a88124a842..3efeb46efe8ae57ed87ec6deea5cf7fab4d3949d 100755 (executable)
--- a/src/utc/sound-manager/tct-sound-manager-core_common_iot.h
+++ b/src/utc/sound-manager/tct-sound-manager-core_common_iot.h
@@ -61,6 +61,8 @@ extern int utc_media_sound_manager_get_voip_session_mode_n1(void);
 extern int utc_media_sound_manager_get_voip_session_mode_n2(void);
 extern int utc_sound_manager_get_current_device_list_p(void);
 extern int utc_sound_manager_get_current_device_list_n(void);
+extern int utc_sound_manager_get_device_list_p(void);
+extern int utc_sound_manager_get_device_list_n(void);
 extern int utc_sound_manager_get_next_device_p(void);
 extern int utc_sound_manager_get_next_device_n(void);
 extern int utc_sound_manager_get_prev_device_p(void);
@@ -170,6 +172,8 @@ testcase tc_array[] = {
     {"utc_media_sound_manager_get_voip_session_mode_n2", utc_media_sound_manager_get_voip_session_mode_n2, NULL, NULL},
     {"utc_sound_manager_get_current_device_list_p", utc_sound_manager_get_current_device_list_p, NULL, NULL},
     {"utc_sound_manager_get_current_device_list_n", utc_sound_manager_get_current_device_list_n, NULL, NULL},
+    {"utc_sound_manager_get_device_list_p", utc_sound_manager_get_device_list_p, NULL, NULL},
+    {"utc_sound_manager_get_device_list_n", utc_sound_manager_get_device_list_n, NULL, NULL},
     {"utc_sound_manager_get_next_device_p", utc_sound_manager_get_next_device_p, NULL, NULL},
     {"utc_sound_manager_get_next_device_n", utc_sound_manager_get_next_device_n, NULL, NULL},
     {"utc_sound_manager_get_prev_device_p", utc_sound_manager_get_prev_device_p, NULL, NULL},

diff --git a/src/utc/sound-manager/tct-sound-manager-core_mobile.h b/src/utc/sound-manager/tct-sound-manager-core_mobile.h
index 97b6223c8df043853b8aa2e52dc6b4a88124a842..3efeb46efe8ae57ed87ec6deea5cf7fab4d3949d 100755 (executable)
--- a/src/utc/sound-manager/tct-sound-manager-core_mobile.h
+++ b/src/utc/sound-manager/tct-sound-manager-core_mobile.h
@@ -61,6 +61,8 @@ extern int utc_media_sound_manager_get_voip_session_mode_n1(void);
 extern int utc_media_sound_manager_get_voip_session_mode_n2(void);
 extern int utc_sound_manager_get_current_device_list_p(void);
 extern int utc_sound_manager_get_current_device_list_n(void);
+extern int utc_sound_manager_get_device_list_p(void);
+extern int utc_sound_manager_get_device_list_n(void);
 extern int utc_sound_manager_get_next_device_p(void);
 extern int utc_sound_manager_get_next_device_n(void);
 extern int utc_sound_manager_get_prev_device_p(void);
@@ -170,6 +172,8 @@ testcase tc_array[] = {
     {"utc_media_sound_manager_get_voip_session_mode_n2", utc_media_sound_manager_get_voip_session_mode_n2, NULL, NULL},
     {"utc_sound_manager_get_current_device_list_p", utc_sound_manager_get_current_device_list_p, NULL, NULL},
     {"utc_sound_manager_get_current_device_list_n", utc_sound_manager_get_current_device_list_n, NULL, NULL},
+    {"utc_sound_manager_get_device_list_p", utc_sound_manager_get_device_list_p, NULL, NULL},
+    {"utc_sound_manager_get_device_list_n", utc_sound_manager_get_device_list_n, NULL, NULL},
     {"utc_sound_manager_get_next_device_p", utc_sound_manager_get_next_device_p, NULL, NULL},
     {"utc_sound_manager_get_next_device_n", utc_sound_manager_get_next_device_n, NULL, NULL},
     {"utc_sound_manager_get_prev_device_p", utc_sound_manager_get_prev_device_p, NULL, NULL},

diff --git a/src/utc/sound-manager/tct-sound-manager-core_tv.h b/src/utc/sound-manager/tct-sound-manager-core_tv.h
index 97b6223c8df043853b8aa2e52dc6b4a88124a842..3efeb46efe8ae57ed87ec6deea5cf7fab4d3949d 100755 (executable)
--- a/src/utc/sound-manager/tct-sound-manager-core_tv.h
+++ b/src/utc/sound-manager/tct-sound-manager-core_tv.h
@@ -61,6 +61,8 @@ extern int utc_media_sound_manager_get_voip_session_mode_n1(void);
 extern int utc_media_sound_manager_get_voip_session_mode_n2(void);
 extern int utc_sound_manager_get_current_device_list_p(void);
 extern int utc_sound_manager_get_current_device_list_n(void);
+extern int utc_sound_manager_get_device_list_p(void);
+extern int utc_sound_manager_get_device_list_n(void);
 extern int utc_sound_manager_get_next_device_p(void);
 extern int utc_sound_manager_get_next_device_n(void);
 extern int utc_sound_manager_get_prev_device_p(void);
@@ -170,6 +172,8 @@ testcase tc_array[] = {
     {"utc_media_sound_manager_get_voip_session_mode_n2", utc_media_sound_manager_get_voip_session_mode_n2, NULL, NULL},
     {"utc_sound_manager_get_current_device_list_p", utc_sound_manager_get_current_device_list_p, NULL, NULL},
     {"utc_sound_manager_get_current_device_list_n", utc_sound_manager_get_current_device_list_n, NULL, NULL},
+    {"utc_sound_manager_get_device_list_p", utc_sound_manager_get_device_list_p, NULL, NULL},
+    {"utc_sound_manager_get_device_list_n", utc_sound_manager_get_device_list_n, NULL, NULL},
     {"utc_sound_manager_get_next_device_p", utc_sound_manager_get_next_device_p, NULL, NULL},
     {"utc_sound_manager_get_next_device_n", utc_sound_manager_get_next_device_n, NULL, NULL},
     {"utc_sound_manager_get_prev_device_p", utc_sound_manager_get_prev_device_p, NULL, NULL},

diff --git a/src/utc/sound-manager/tct-sound-manager-core_wearable.h b/src/utc/sound-manager/tct-sound-manager-core_wearable.h
index 97b6223c8df043853b8aa2e52dc6b4a88124a842..3efeb46efe8ae57ed87ec6deea5cf7fab4d3949d 100755 (executable)
--- a/src/utc/sound-manager/tct-sound-manager-core_wearable.h
+++ b/src/utc/sound-manager/tct-sound-manager-core_wearable.h
@@ -61,6 +61,8 @@ extern int utc_media_sound_manager_get_voip_session_mode_n1(void);
 extern int utc_media_sound_manager_get_voip_session_mode_n2(void);
 extern int utc_sound_manager_get_current_device_list_p(void);
 extern int utc_sound_manager_get_current_device_list_n(void);
+extern int utc_sound_manager_get_device_list_p(void);
+extern int utc_sound_manager_get_device_list_n(void);
 extern int utc_sound_manager_get_next_device_p(void);
 extern int utc_sound_manager_get_next_device_n(void);
 extern int utc_sound_manager_get_prev_device_p(void);
@@ -170,6 +172,8 @@ testcase tc_array[] = {
     {"utc_media_sound_manager_get_voip_session_mode_n2", utc_media_sound_manager_get_voip_session_mode_n2, NULL, NULL},
     {"utc_sound_manager_get_current_device_list_p", utc_sound_manager_get_current_device_list_p, NULL, NULL},
     {"utc_sound_manager_get_current_device_list_n", utc_sound_manager_get_current_device_list_n, NULL, NULL},
+    {"utc_sound_manager_get_device_list_p", utc_sound_manager_get_device_list_p, NULL, NULL},
+    {"utc_sound_manager_get_device_list_n", utc_sound_manager_get_device_list_n, NULL, NULL},
     {"utc_sound_manager_get_next_device_p", utc_sound_manager_get_next_device_p, NULL, NULL},
     {"utc_sound_manager_get_next_device_n", utc_sound_manager_get_next_device_n, NULL, NULL},
     {"utc_sound_manager_get_prev_device_p", utc_sound_manager_get_prev_device_p, NULL, NULL},

diff --git a/src/utc/sound-manager/utc-media-sound-manager.c b/src/utc/sound-manager/utc-media-sound-manager.c
index d6340f10eb06ebd653adffcb1ffa6bf95163a680..9ca6314d4ae0cd4e6130d808fe34d7a1d1cfdfe7 100755 (executable)
--- a/src/utc/sound-manager/utc-media-sound-manager.c
+++ b/src/utc/sound-manager/utc-media-sound-manager.c
@@ -23,12 +23,12 @@
 #define MICROPHONE_FEATURE           "http://tizen.org/feature/microphone"
 
 #define GET_LIST_N_GET_FIRST_DATA(list, device, ret) do { \
-       ret = sound_manager_get_current_device_list(SOUND_DEVICE_ALL_MASK, &list); \
+       ret = sound_manager_get_device_list(SOUND_DEVICE_ALL_MASK, &list); \
        if (ret == SOUND_MANAGER_ERROR_NO_DATA) \
                return 0; \
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE); \
        ret = sound_manager_get_next_device(list, &device); \
-       /* ret can't be NO_DATA as return of get_current_device_list() is not NO_DATA */ \
+       /* ret can't be NO_DATA as return of get_device_list() is not NO_DATA */ \
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE); \
 } while (0)
 
@@ -701,7 +701,7 @@ int utc_media_sound_manager_set_voip_session_mode_p(void)
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
        ret = sound_manager_set_voip_session_mode(mode);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
-       ret = sound_manager_get_current_device_list(SOUND_DEVICE_ALL_MASK, &list);
+       ret = sound_manager_get_device_list(SOUND_DEVICE_ALL_MASK, &list);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
        while (sound_manager_get_next_device(list, &device) == SOUND_MANAGER_ERROR_NONE){
                ret = sound_manager_get_device_type(device, &type);
@@ -727,8 +727,6 @@ int utc_media_sound_manager_set_voip_session_mode_p(void)
                        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
                }
        }
-       ret = sound_manager_free_device_list(list);
-       assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
 
        return 0;
 }
@@ -806,7 +804,7 @@ int utc_media_sound_manager_get_voip_session_mode_p(void)
        ret = sound_manager_get_voip_session_mode(&mode_g);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
        assert_eq(mode_g, mode);
-       ret = sound_manager_get_current_device_list(SOUND_DEVICE_ALL_MASK, &list);
+       ret = sound_manager_get_device_list(SOUND_DEVICE_ALL_MASK, &list);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
        while (sound_manager_get_next_device(list, &device) == SOUND_MANAGER_ERROR_NONE){
                ret = sound_manager_get_device_type(device, &type);
@@ -900,9 +898,6 @@ int utc_sound_manager_get_current_device_list_p(void)
                return 0;
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
 
-       ret = sound_manager_free_device_list(list);
-       assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
-
        return 0;
 }
 
@@ -923,6 +918,43 @@ int utc_sound_manager_get_current_device_list_n(void)
        return 0;
 }
 
+/**
+ * @testcase           utc_sound_manager_get_device_list_p
+ * @since_tizen                2.3
+ * @description                Gets the list consisting of connected devices
+ */
+int utc_sound_manager_get_device_list_p(void)
+{
+       int ret;
+       sound_device_list_h list;
+
+       ret = sound_manager_get_device_list(SOUND_DEVICE_ALL_MASK, &list);
+       if (ret == SOUND_MANAGER_ERROR_NO_DATA)
+               return 0;
+       assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
+       ret = sound_manager_free_device_list(list);
+       assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
+
+       return 0;
+}
+
+/**
+ * @testcase           utc_sound_manager_get_device_list_n
+ * @since_tizen                2.3
+ * @description                Gets the list consisting of connected devices
+ *                             - Pass invalid devie mask to get negative result
+ */
+int utc_sound_manager_get_device_list_n(void)
+{
+       int ret;
+       sound_device_list_h list;
+
+       ret = sound_manager_get_device_list(0, &list);
+       assert_eq(ret, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
+
+       return 0;
+}
+
 /**
  * @testcase           utc_sound_manager_get_next_device_p
  * @since_tizen                2.3
@@ -954,7 +986,7 @@ int utc_sound_manager_get_next_device_n(void)
        int ret;
        sound_device_list_h list;
 
-       ret = sound_manager_get_current_device_list(SOUND_DEVICE_ALL_MASK, &list);
+       ret = sound_manager_get_device_list(SOUND_DEVICE_ALL_MASK, &list);
        if (ret == SOUND_MANAGER_ERROR_NO_DATA)
                return 0;
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
@@ -984,12 +1016,12 @@ int utc_sound_manager_get_prev_device_p(void)
        sound_device_h device;
 
        /* Get List */
-       ret = sound_manager_get_current_device_list(SOUND_DEVICE_ALL_MASK, &list);
+       ret = sound_manager_get_device_list(SOUND_DEVICE_ALL_MASK, &list);
        if(ret == SOUND_MANAGER_ERROR_NO_DATA)
                return 0;
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
 
-       /* Get First : Must exists as return of get_current_device_list() is not NO_DATA */
+       /* Get First : Must exists as return of get_device_list() is not NO_DATA */
        ret = sound_manager_get_next_device(list, &device_fst);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
 
@@ -1024,7 +1056,7 @@ int utc_sound_manager_get_prev_device_n(void)
        int ret;
        sound_device_list_h list;
 
-       ret = sound_manager_get_current_device_list(SOUND_DEVICE_ALL_MASK, &list);
+       ret = sound_manager_get_device_list(SOUND_DEVICE_ALL_MASK, &list);
        if(ret == SOUND_MANAGER_ERROR_NO_DATA)
                return 0;
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
@@ -1304,7 +1336,7 @@ int utc_sound_manager_get_bt_device_avail_modes_p(void)
        sound_device_type_e type;
        int avail_mode;
 
-       ret = sound_manager_get_current_device_list(SOUND_DEVICE_ALL_MASK, &list);
+       ret = sound_manager_get_device_list(SOUND_DEVICE_ALL_MASK, &list);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
 
        while (sound_manager_get_next_device(list, &device) == SOUND_MANAGER_ERROR_NONE) {
@@ -1339,7 +1371,7 @@ int utc_sound_manager_get_bt_device_avail_modes_n(void)
        sound_device_type_e type;
        int avail_mode;
 
-       ret = sound_manager_get_current_device_list(SOUND_DEVICE_ALL_MASK, &list);
+       ret = sound_manager_get_device_list(SOUND_DEVICE_ALL_MASK, &list);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
 
        while (sound_manager_get_next_device(list, &device) == SOUND_MANAGER_ERROR_NONE) {
@@ -1369,7 +1401,7 @@ int utc_sound_manager_free_device_list_p(void)
        int ret;
        sound_device_list_h list;
 
-       ret = sound_manager_get_current_device_list(SOUND_DEVICE_ALL_MASK, &list);
+       ret = sound_manager_get_device_list(SOUND_DEVICE_ALL_MASK, &list);
        if (ret == SOUND_MANAGER_ERROR_NO_DATA)
                return 0;
        ret = sound_manager_free_device_list(list);
@@ -1488,7 +1520,7 @@ int utc_sound_manager_add_device_for_stream_routing_p(void)
 
        ret = sound_manager_create_stream_information(SOUND_STREAM_TYPE_VOIP, _sound_stream_focus_state_changed_cb, NULL, &stream_info);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
-       ret = sound_manager_get_current_device_list(SOUND_DEVICE_ALL_MASK, &list);
+       ret = sound_manager_get_device_list(SOUND_DEVICE_ALL_MASK, &list);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
        ret = sound_manager_get_next_device(list, &device);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
@@ -1516,7 +1548,7 @@ int utc_sound_manager_add_device_for_stream_routing_n1(void)
 
        ret = sound_manager_create_stream_information(SOUND_STREAM_TYPE_VOIP, _sound_stream_focus_state_changed_cb, NULL, &stream_info);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
-       ret = sound_manager_get_current_device_list(SOUND_DEVICE_ALL_MASK, &list);
+       ret = sound_manager_get_device_list(SOUND_DEVICE_ALL_MASK, &list);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
        ret = sound_manager_get_next_device(list, &device);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
@@ -1544,7 +1576,7 @@ int utc_sound_manager_add_device_for_stream_routing_n2(void)
 
        ret = sound_manager_create_stream_information(SOUND_STREAM_TYPE_MEDIA, _sound_stream_focus_state_changed_cb, NULL, &stream_info);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
-       ret = sound_manager_get_current_device_list(SOUND_DEVICE_ALL_MASK, &list);
+       ret = sound_manager_get_device_list(SOUND_DEVICE_ALL_MASK, &list);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
        ret = sound_manager_get_next_device(list, &device);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
@@ -1576,7 +1608,7 @@ int utc_sound_manager_remove_device_for_stream_routing_p(void)
 
        ret = sound_manager_create_stream_information(SOUND_STREAM_TYPE_VOIP, _sound_stream_focus_state_changed_cb, NULL, &stream_info);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
-       ret = sound_manager_get_current_device_list(SOUND_DEVICE_ALL_MASK, &list);
+       ret = sound_manager_get_device_list(SOUND_DEVICE_ALL_MASK, &list);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
        ret = sound_manager_get_next_device(list, &device);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
@@ -1606,7 +1638,7 @@ int utc_sound_manager_remove_device_for_stream_routing_n(void)
 
        ret = sound_manager_create_stream_information(SOUND_STREAM_TYPE_VOIP, _sound_stream_focus_state_changed_cb, NULL, &stream_info);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
-       ret = sound_manager_get_current_device_list(SOUND_DEVICE_ALL_MASK, &list);
+       ret = sound_manager_get_device_list(SOUND_DEVICE_ALL_MASK, &list);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
        ret = sound_manager_get_next_device(list, &device);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
@@ -1640,7 +1672,7 @@ int utc_sound_manager_apply_stream_routing_p(void)
 
        ret = sound_manager_create_stream_information(SOUND_STREAM_TYPE_VOIP, _sound_stream_focus_state_changed_cb, NULL, &stream_info);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
-       ret = sound_manager_get_current_device_list(SOUND_DEVICE_ALL_MASK, &list);
+       ret = sound_manager_get_device_list(SOUND_DEVICE_ALL_MASK, &list);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
        ret = sound_manager_get_next_device(list, &device);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
@@ -1670,7 +1702,7 @@ int utc_sound_manager_apply_stream_routing_n(void)
 
        ret = sound_manager_create_stream_information(SOUND_STREAM_TYPE_VOIP, _sound_stream_focus_state_changed_cb, NULL, &stream_info);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
-       ret = sound_manager_get_current_device_list(SOUND_DEVICE_ALL_MASK, &list);
+       ret = sound_manager_get_device_list(SOUND_DEVICE_ALL_MASK, &list);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);
        ret = sound_manager_get_next_device(list, &device);
        assert_eq(ret, SOUND_MANAGER_ERROR_NONE);