Merge branch 'tizen_3.0' into tizen

Change-Id: I44d7e53cde28ec2472d3d65002d281b092291b0d

diff --git a/packaging/libmm-radio.spec b/packaging/libmm-radio.spec
index 68cd850..08170a3 100755 (executable)
--- a/packaging/libmm-radio.spec
+++ b/packaging/libmm-radio.spec
@@ -1,6 +1,6 @@
 Name:       libmm-radio
 Summary:    Multimedia Framework Radio Library
-Version:    0.2.10
+Version:    0.2.11
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/src/mm_radio_sound_focus.c b/src/mm_radio_sound_focus.c
index b5f318c..a780fd1 100644 (file)
--- a/src/mm_radio_sound_focus.c
+++ b/src/mm_radio_sound_focus.c
@@ -123,14 +123,12 @@ int mmradio_sound_focus_register(mm_radio_sound_focus *sound_focus,
        if (ret == MM_ERROR_INVALID_HANDLE) {
                MMRADIO_LOG_WARNING("subscribe_id=%d\n", sound_focus->subscribe_id);
                if (sound_focus->subscribe_id == 0) {
-/*
                        ret = mm_sound_subscribe_signal_for_daemon(MM_SOUND_SIGNAL_RELEASE_INTERNAL_FOCUS, pid, &sound_focus->subscribe_id,
                                                                        (mm_sound_signal_callback)_mmradio_sound_signal_callback, (void*)sound_focus);
                        if (ret != MM_ERROR_NONE) {
                                MMRADIO_LOG_ERROR("mm_sound_subscribe_signal is failed\n");
                                return MM_ERROR_POLICY_BLOCKED;
                        }
-*/
                        MMRADIO_LOG_DEBUG("register focus watch callback for the value is 0, sub_cb id %d\n", sound_focus->subscribe_id);
                        /* register watch callback */
                        ret = mm_sound_set_focus_watch_callback_for_session(pid,