Fix the bug in GetActiveBluetoothA2dpName()

Change-Id: If1fe50a6a61c09368004b18a06e78457ec0f969e
Signed-off-by: EonseokLee <eonseok.lee@samsung.com>

diff --git a/src/FMedia_AudioManagerConvert.cpp b/src/FMedia_AudioManagerConvert.cpp
index df77121..e7a93b1 100644 (file)
--- a/src/FMedia_AudioManagerConvert.cpp
+++ b/src/FMedia_AudioManagerConvert.cpp
@@ -118,7 +118,7 @@ _AudioManagerConvert::CovertSoundManagerError2Result(int error)
        case SOUND_MANAGER_ERROR_INVALID_PARAMETER:
                return E_INVALID_ARG;
        case SOUND_MANAGER_ERROR_INVALID_OPERATION:
-               return E_INVALID_OPERATION;
+               return E_SYSTEM;
        case SOUND_MANAGER_ERROR_NO_PLAYING_SOUND:
                return E_SYSTEM;
        default:

diff --git a/src/FMedia_AudioRouteManagerImpl.cpp b/src/FMedia_AudioRouteManagerImpl.cpp
index 1cda761..de60afa 100644 (file)
--- a/src/FMedia_AudioRouteManagerImpl.cpp
+++ b/src/FMedia_AudioRouteManagerImpl.cpp
@@ -187,8 +187,8 @@ result
 _AudioRouteManagerImpl::SetAudioRouteEventListener(IAudioRouteEventListener* pListener)
 {
        result r = E_SUCCESS;
-       SysTryReturn(NID_MEDIA, __pAudioRouteEvent != null, E_INVALID_OPERATION, E_INVALID_OPERATION,
-               "[E_INVALID_OPERATION] A error has been occurred. The value of __pAudioRouteEvent is null.");
+       SysTryReturn(NID_MEDIA, __pAudioRouteEvent != null, E_SYSTEM, E_SYSTEM,
+               "[E_SYSTEM] A error has been occurred. The value of __pAudioRouteEvent is null.");
        if (__pSingleAudioRouteListner != null)
        {
                r = __pAudioRouteEvent->RemoveListener(*__pSingleAudioRouteListner);
@@ -227,7 +227,7 @@ _AudioRouteManagerImpl::GetActiveBluetoothA2dpName(void)
        }
        else
        {
-               SetLastResult(E_INVALID_OPERATION);
+               SetLastResult(E_DEVICE_UNAVAILABLE);
                return String("");
        }
 CATCH:
@@ -340,8 +340,8 @@ _AudioRouteManagerImpl::SetActiveAudioRoute(const AudioRouteInfo& device)
        }
        SysTryReturn(NID_MEDIA, route != 0, E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] Invalid argument is used. The value of device is wrong");
        bool routeAvailable = sound_manager_is_route_available((sound_route_e)route);
-       SysTryReturn(NID_MEDIA, routeAvailable == true, E_INVALID_OPERATION, E_INVALID_OPERATION,
-               "[E_INVALID_OPERATION] Failed to perform sound_manager_is_route_available operation.");
+       SysTryReturn(NID_MEDIA, routeAvailable == true, E_SYSTEM, E_SYSTEM,
+               "[E_SYSTEM] Failed to perform sound_manager_is_route_available operation.");
        ret = sound_manager_set_active_route((sound_route_e)route);
        r = _AudioManagerConvert::CovertSoundManagerError2Result(ret);
        SysTryReturn(NID_MEDIA, r == E_SUCCESS, r, r, "[%s] Failed to perform sound_manager_set_active_route operation with error code : 0x%x", GetErrorMessage(r), ret);