fix incorrect permission and rm power off cb of media-server

Change-Id: I7d3109ddc89236ffcde96aed67139c53cfe83353

diff --git a/lib/include/media-server-ipc.h b/lib/include/media-server-ipc.h
index 440f41f..f787e9a 100755 (executable)
--- a/lib/include/media-server-ipc.h
+++ b/lib/include/media-server-ipc.h
@@ -74,7 +74,7 @@ typedef enum {
 
 #define MS_SCANNER_FIFO_PATH_REQ "/tmp/media-scanner-fifo-req"
 #define MS_SCANNER_FIFO_PATH_RES "/tmp/media-scanner-fifo-res"
-#define MS_SCANNER_FIFO_MODE 0666
+#define MS_SCANNER_FIFO_MODE 0664
 #define MS_UUID_SIZE 37 /* size of uuid + NULL */
 
 typedef struct {

diff --git a/lib/media-util-ipc.c b/lib/media-util-ipc.c
index af9727c..d7fca71 100755 (executable)
--- a/lib/media-util-ipc.c
+++ b/lib/media-util-ipc.c
@@ -116,7 +116,7 @@ int ms_ipc_create_server_socket(ms_msg_port_type_e port, int *sock_fd)
        MSAPI_DBG("Listening...");
 
        /*change permission of sock file*/
-       if (chmod(tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[serv_port]), 0777) < 0)
+       if (chmod(tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[serv_port]), 0776) < 0)
                MSAPI_DBG_STRERROR("chmod failed");
 
        *sock_fd = sock;

diff --git a/src/server/media-server-main.c b/src/server/media-server-main.c
index c5286fd..84d0b3f 100755 (executable)
--- a/src/server/media-server-main.c
+++ b/src/server/media-server-main.c
@@ -299,13 +299,6 @@ void _power_off_cb(ms_power_info_s *power_info, void* data)
 
        return;
 }
-#else
-int _power_off_cb(int option, void *data)
-{
-       MS_DBG_ERR("POWER OFF");
-
-       return MS_MEDIA_ERR_NONE;
-}
 #endif
 
 void _ms_signal_handler(int n)
@@ -564,7 +557,9 @@ static void __ms_add_event_receiver(GIOChannel *channel)
                MS_DBG_ERR("add call back function for event %s fails", MS_DISC_STATE);
 #endif
        /*set power off callback function*/
+#ifdef _USE_DEVICED_DBUS
        ms_sys_set_poweroff_cb(_power_off_cb, channel);
+#endif
        ms_sys_set_device_block_event_cb(ms_device_block_changed_cb, NULL);
 
        return;