Unify indentation 62/218462/1
authorJi-hoon Lee <dalton.lee@samsung.com>
Fri, 22 Nov 2019 10:57:21 +0000 (19:57 +0900)
committerJi-hoon Lee <dalton.lee@samsung.com>
Fri, 22 Nov 2019 10:57:21 +0000 (19:57 +0900)
Change-Id: I37f0b6fc8304bfb2498f4df6b533637566ea7ab4

inc/multi_assistant_service_plugin.h
packaging/org.tizen.multi-assistant-service.spec
plugins/wakeup-manager/inc/heap_tracer.h
plugins/wakeup-manager/src/heap_tracer.cpp
src/multi_assistant_dbus.c
src/multi_assistant_service_plugin.c

index b225b29..69fd1be 100644 (file)
@@ -181,41 +181,41 @@ typedef int (*wakeup_manager_set_streaming_section_changed_callback)(wakeup_serv
 typedef int (*wakeup_manager_set_wakeup_engine_command_callback)(wakeup_service_wakeup_engine_command_cb callback, void* user_data);
 
 typedef struct {
-       wakeup_manager_initialize                                                                initialize;
-       wakeup_manager_deinitialize                                                              deinitialize;
-       wakeup_manager_get_settings                                                              get_settings;
-       wakeup_manager_add_assistant_wakeup_word                                 add_assistant_wakeup_word;
-       wakeup_manager_add_assistant_language                                    add_assistant_language;
-       wakeup_manager_set_assistant_wakeup_engine                               set_assistant_wakeup_engine;
-       wakeup_manager_set_default_assistant                                     set_default_assistant;
-       wakeup_manager_get_default_assistant                                     get_default_assistant;
-       wakeup_manager_set_language                                                              set_language;
-       wakeup_manager_activate                                                                  activate;
-       wakeup_manager_deactivate                                                                deactivate;
-       wakeup_manager_update_voice_feedback_state                               update_voice_feedback_state;
-       wakeup_manager_send_assistant_specific_command                   send_assistant_specific_command;
-       wakeup_manager_set_background_volume                                     set_background_volume;
-       wakeup_manager_update_recognition_result                                 update_recognition_result;
-       wakeup_manager_process_event                                                     process_event;
-       wakeup_manager_start_streaming_utterance_data                    start_streaming_utterance_data;
-       wakeup_manager_stop_streaming_utterance_data                     stop_streaming_utterance_data;
-       wakeup_manager_start_streaming_previous_utterance_data   start_streaming_previous_utterance_data;
-       wakeup_manager_stop_streaming_previous_utterance_data    stop_streaming_previous_utterance_data;
-       wakeup_manager_start_streaming_follow_up_data                    start_streaming_follow_up_data;
-       wakeup_manager_stop_streaming_follow_up_data                     stop_streaming_follow_up_data;
-       wakeup_manager_get_audio_format                                                  get_audio_format;
-       wakeup_manager_get_audio_source_type                                     get_audio_source_type;
-       wakeup_manager_set_wake_word_audio_require_flag                  set_wake_word_audio_require_flag;
-       wakeup_manager_set_assistant_language                                    set_assistant_language;
-       wakeup_manager_set_wakeup_event_callback                                 set_wakeup_event_callback;
-       wakeup_manager_set_utterance_streaming_callback                  set_utterance_streaming_callback;
+       wakeup_manager_initialize                                                                       initialize;
+       wakeup_manager_deinitialize                                                                     deinitialize;
+       wakeup_manager_get_settings                                                                     get_settings;
+       wakeup_manager_add_assistant_wakeup_word                                        add_assistant_wakeup_word;
+       wakeup_manager_add_assistant_language                                           add_assistant_language;
+       wakeup_manager_set_assistant_wakeup_engine                                      set_assistant_wakeup_engine;
+       wakeup_manager_set_default_assistant                                            set_default_assistant;
+       wakeup_manager_get_default_assistant                                            get_default_assistant;
+       wakeup_manager_set_language                                                                     set_language;
+       wakeup_manager_activate                                                                         activate;
+       wakeup_manager_deactivate                                                                       deactivate;
+       wakeup_manager_update_voice_feedback_state                                      update_voice_feedback_state;
+       wakeup_manager_send_assistant_specific_command                          send_assistant_specific_command;
+       wakeup_manager_set_background_volume                                            set_background_volume;
+       wakeup_manager_update_recognition_result                                        update_recognition_result;
+       wakeup_manager_process_event                                                            process_event;
+       wakeup_manager_start_streaming_utterance_data                           start_streaming_utterance_data;
+       wakeup_manager_stop_streaming_utterance_data                            stop_streaming_utterance_data;
+       wakeup_manager_start_streaming_previous_utterance_data          start_streaming_previous_utterance_data;
+       wakeup_manager_stop_streaming_previous_utterance_data           stop_streaming_previous_utterance_data;
+       wakeup_manager_start_streaming_follow_up_data                           start_streaming_follow_up_data;
+       wakeup_manager_stop_streaming_follow_up_data                            stop_streaming_follow_up_data;
+       wakeup_manager_get_audio_format                                                         get_audio_format;
+       wakeup_manager_get_audio_source_type                                            get_audio_source_type;
+       wakeup_manager_set_wake_word_audio_require_flag                         set_wake_word_audio_require_flag;
+       wakeup_manager_set_assistant_language                                           set_assistant_language;
+       wakeup_manager_set_wakeup_event_callback                                        set_wakeup_event_callback;
+       wakeup_manager_set_utterance_streaming_callback                         set_utterance_streaming_callback;
        wakeup_manager_set_previous_utterance_streaming_callback        set_previous_utterance_streaming_callback;
-       wakeup_manager_set_follow_up_streaming_callback                  set_follow_up_streaming_callback;
-       wakeup_manager_set_speech_status_callback                                set_speech_status_callback;
-       wakeup_manager_set_setting_changed_callback                              set_setting_changed_callback;
-       wakeup_manager_set_error_callback                                                set_error_callback;
-       wakeup_manager_set_streaming_section_changed_callback    set_streaming_section_changed_callback;
-       wakeup_manager_set_wakeup_engine_command_callback                set_wakeup_engine_command_callback;
+       wakeup_manager_set_follow_up_streaming_callback                         set_follow_up_streaming_callback;
+       wakeup_manager_set_speech_status_callback                                       set_speech_status_callback;
+       wakeup_manager_set_setting_changed_callback                                     set_setting_changed_callback;
+       wakeup_manager_set_error_callback                                                       set_error_callback;
+       wakeup_manager_set_streaming_section_changed_callback           set_streaming_section_changed_callback;
+       wakeup_manager_set_wakeup_engine_command_callback                       set_wakeup_engine_command_callback;
 } wakeup_manager_interface;
 
 #ifdef __cplusplus
index 0bcc5e4..8de1ed1 100644 (file)
@@ -52,8 +52,8 @@ LDFLAGS="$LDFLAGS -Wl,-z -Wl,nodelete"
 
 export LDFLAGS
 cmake \
-      -DCMAKE_INSTALL_PREFIX=%{_appdir} \
-      -DTZ_SYS_RO_SHARE=%TZ_SYS_RO_SHARE \
+       -DCMAKE_INSTALL_PREFIX=%{_appdir} \
+       -DTZ_SYS_RO_SHARE=%TZ_SYS_RO_SHARE \
 
 make %{?jobs:-j%jobs}
 
index fc7df29..cc8c671 100644 (file)
@@ -41,41 +41,41 @@ void *vm_mark_unmanaged(void *ptr, const char *fmt, ...);
 
 class HeapTracer {
 public:
-    HeapTracer();
-    virtual ~HeapTracer();
+       HeapTracer();
+       virtual ~HeapTracer();
 
-    bool Insert(void *ptr, std::string description, size_t size = 0);
-    bool Delete(void *ptr, std::string description);
-    std::string Find(void *ptr);
+       bool Insert(void *ptr, std::string description, size_t size = 0);
+       bool Delete(void *ptr, std::string description);
+       std::string Find(void *ptr);
 
-    void MarkUnmanaged(void *ptr, std::string description);
+       void MarkUnmanaged(void *ptr, std::string description);
 
-    bool Empty();
-    void Trace();
+       bool Empty();
+       void Trace();
 protected:
-    typedef struct {
-        void *ptr{nullptr};
-        std::string description;
-        int size{0};
-    } AllocationEntry;
+       typedef struct {
+               void *ptr{nullptr};
+               std::string description;
+               int size{0};
+       } AllocationEntry;
 
-    std::mutex mManagedTableMutex;
-    std::unordered_map<void*, AllocationEntry> mManagedTable;
+       std::mutex mManagedTableMutex;
+       std::unordered_map<void*, AllocationEntry> mManagedTable;
 
-    std::mutex mUnmanagedRecordsMutex;
-    std::list<AllocationEntry> mUnmanagedRecords;
-    size_t mUnmanagedRecordsSize{0};
+       std::mutex mUnmanagedRecordsMutex;
+       std::list<AllocationEntry> mUnmanagedRecords;
+       size_t mUnmanagedRecordsSize{0};
 
-    enum class EntryOperation {
-        INSERT,
-        DELETE,
-    };
-    typedef struct {
-        AllocationEntry entry;
-        EntryOperation operation;
-        struct timespec ts;
-    } EntryHistory;
-    std::list<EntryHistory> mEntryHistory;
+       enum class EntryOperation {
+               INSERT,
+               DELETE,
+       };
+       typedef struct {
+               AllocationEntry entry;
+               EntryOperation operation;
+               struct timespec ts;
+       } EntryHistory;
+       std::list<EntryHistory> mEntryHistory;
 };
 
 #endif /* __HEAP_TRACER_H__ */
\ No newline at end of file
index 317f670..acf5bc6 100644 (file)
@@ -23,208 +23,208 @@ const bool HEAP_TRACER_LOG_ENABLED = false
 
 void* vm_calloc(size_t nmemb, size_t size, const char *fmt, ...)
 {
-    void *ptr = calloc(nmemb, size);
+       void *ptr = calloc(nmemb, size);
 #ifdef USE_HEAP_TRACER
-    va_list argptr;
-    va_start(argptr, fmt);
+       va_list argptr;
+       va_start(argptr, fmt);
 
-    char description[DESCRIPTION_LENGTH];
-    vsnprintf(description, sizeof(description), fmt, argptr);
-    _tracer.Insert(ptr, description, nmemb * size);
+       char description[DESCRIPTION_LENGTH];
+       vsnprintf(description, sizeof(description), fmt, argptr);
+       _tracer.Insert(ptr, description, nmemb * size);
 
-    va_end(argptr);
+       va_end(argptr);
 #endif
-    return ptr;
+       return ptr;
 }
 
 void* vm_malloc(size_t size, const char *fmt, ...)
 {
-    void *ptr = malloc(size);
+       void *ptr = malloc(size);
 #ifdef USE_HEAP_TRACER
-    va_list argptr;
-    va_start(argptr, fmt);
+       va_list argptr;
+       va_start(argptr, fmt);
 
-    char description[DESCRIPTION_LENGTH];
-    vsnprintf(description, sizeof(description), fmt, argptr);
-    _tracer.Insert(ptr, description, size);
+       char description[DESCRIPTION_LENGTH];
+       vsnprintf(description, sizeof(description), fmt, argptr);
+       _tracer.Insert(ptr, description, size);
 
-    va_end(argptr);
+       va_end(argptr);
 #endif
-    return ptr;
+       return ptr;
 }
 
 void vm_free(void *ptr, const char *fmt, ...)
 {
-    if (ptr) {
+       if (ptr) {
 #ifdef USE_HEAP_TRACER
-        va_list argptr;
-        va_start(argptr, fmt);
-
-        char description[DESCRIPTION_LENGTH];
-        vsnprintf(description, sizeof(description), fmt, argptr);
-        if (false == _tracer.Delete(ptr, description)) {
-            _tracer.Find(ptr);
-        }
-        va_end(argptr);
+               va_list argptr;
+               va_start(argptr, fmt);
+
+               char description[DESCRIPTION_LENGTH];
+               vsnprintf(description, sizeof(description), fmt, argptr);
+               if (false == _tracer.Delete(ptr, description)) {
+                       _tracer.Find(ptr);
+               }
+               va_end(argptr);
 #endif
-        free(ptr);
-    } else {
-        LOGD("Trying to free a null pointer");
-    }
+               free(ptr);
+       } else {
+               LOGD("Trying to free a null pointer");
+       }
 }
 
 char* vm_strdup(const char *s, const char *fmt, ...)
 {
-    char *ptr = nullptr;
-    if (s) {
-        ptr = strdup(s);
+       char *ptr = nullptr;
+       if (s) {
+               ptr = strdup(s);
 #ifdef USE_HEAP_TRACER
-        va_list argptr;
-        va_start(argptr, fmt);
+               va_list argptr;
+               va_start(argptr, fmt);
 
-        char description[DESCRIPTION_LENGTH];
-        vsnprintf(description, sizeof(description), fmt, argptr);
-        _tracer.Insert(ptr, description, strlen(s) + 1);
+               char description[DESCRIPTION_LENGTH];
+               vsnprintf(description, sizeof(description), fmt, argptr);
+               _tracer.Insert(ptr, description, strlen(s) + 1);
 
-        va_end(argptr);
+               va_end(argptr);
 #endif
-    } else {
-        LOGD("Trying to duplicate a null pointer");
-    }
-    return ptr;
+       } else {
+               LOGD("Trying to duplicate a null pointer");
+       }
+       return ptr;
 }
 
 void *vm_mark_unmanaged(void *ptr, const char *fmt, ...)
 {
 #ifdef USE_HEAP_TRACER
-    va_list argptr;
-    va_start(argptr, fmt);
+       va_list argptr;
+       va_start(argptr, fmt);
 
-    char description[DESCRIPTION_LENGTH];
-    vsnprintf(description, sizeof(description), fmt, argptr);
-    _tracer.MarkUnmanaged(ptr, description);
+       char description[DESCRIPTION_LENGTH];
+       vsnprintf(description, sizeof(description), fmt, argptr);
+       _tracer.MarkUnmanaged(ptr, description);
 
-    va_end(argptr);
+       va_end(argptr);
 #endif
-    return ptr;
+       return ptr;
 }
 
 HeapTracer::HeapTracer()
 {
-    LOGD("HeapTracer()");
+       LOGD("HeapTracer()");
 }
 
 HeapTracer::~HeapTracer()
 {
-    LOGD("~HeapTracer()");
+       LOGD("~HeapTracer()");
 
-    Trace();
+       Trace();
 }
 
 bool HeapTracer::Insert(void *ptr, std::string description, size_t size)
 {
-    if (HEAP_TRACER_LOG_ENABLED) {
-        LOGD("Heap allocated %p [size %zu] : %s", ptr, size, description.c_str());
-    }
+       if (HEAP_TRACER_LOG_ENABLED) {
+               LOGD("Heap allocated %p [size %zu] : %s", ptr, size, description.c_str());
+       }
 
-    AllocationEntry entry;
-    entry.ptr = ptr;
-    entry.description = description;
-    entry.size = size;
+       AllocationEntry entry;
+       entry.ptr = ptr;
+       entry.description = description;
+       entry.size = size;
 
-    std::lock_guard<std::mutex> lock(mManagedTableMutex);
-    mManagedTable[ptr] = entry;
+       std::lock_guard<std::mutex> lock(mManagedTableMutex);
+       mManagedTable[ptr] = entry;
 
 #ifdef RECORD_ALL_HISTORY
-    EntryHistory history;
-    history.entry = entry;
-    history.operation = EntryOperation::INSERT;
-    clock_gettime(CLOCK_REALTIME, &(history.ts));
-    mEntryHistory.push_back(history);
+       EntryHistory history;
+       history.entry = entry;
+       history.operation = EntryOperation::INSERT;
+       clock_gettime(CLOCK_REALTIME, &(history.ts));
+       mEntryHistory.push_back(history);
 #endif
-    return true;
+       return true;
 }
 
 bool HeapTracer::Delete(void *ptr, std::string description)
 {
-    if (HEAP_TRACER_LOG_ENABLED) {
-        LOGD("Heap deallocated %p : %s", ptr, description.c_str());
-    }
+       if (HEAP_TRACER_LOG_ENABLED) {
+               LOGD("Heap deallocated %p : %s", ptr, description.c_str());
+       }
 
-    std::lock_guard<std::mutex> lock(mManagedTableMutex);
-    if (mManagedTable.find(ptr) != mManagedTable.end()) {
+       std::lock_guard<std::mutex> lock(mManagedTableMutex);
+       if (mManagedTable.find(ptr) != mManagedTable.end()) {
 #ifdef RECORD_ALL_HISTORY
-        EntryHistory history;
-        history.entry = mManagedTable[ptr];
-        history.entry.description = description;
-        history.operation = EntryOperation::DELETE;
-        clock_gettime(CLOCK_REALTIME, &(history.ts));
-        mEntryHistory.push_back(history);
+               EntryHistory history;
+               history.entry = mManagedTable[ptr];
+               history.entry.description = description;
+               history.operation = EntryOperation::DELETE;
+               clock_gettime(CLOCK_REALTIME, &(history.ts));
+               mEntryHistory.push_back(history);
 #endif
-        mManagedTable.erase(ptr);
-    } else {
-        LOGE("Heap Trace Error : Trying to delete an entry that does not exist : %p, %s",
-            ptr, description.c_str());
-        return false;
-    }
-    return true;
+               mManagedTable.erase(ptr);
+       } else {
+               LOGE("Heap Trace Error : Trying to delete an entry that does not exist : %p, %s",
+                       ptr, description.c_str());
+               return false;
+       }
+       return true;
 }
 
 std::string HeapTracer::Find(void *ptr)
 {
-    std::lock_guard<std::mutex> lock(mManagedTableMutex);
+       std::lock_guard<std::mutex> lock(mManagedTableMutex);
 #ifdef RECORD_ALL_HISTORY
-    for (auto entry : mEntryHistory) {
-        if (entry.entry.ptr == ptr) {
-            LOGD("Heap history record for %p : %s, %lld.%.9ld, %s",
-                ptr,
-                (entry.operation == EntryOperation::INSERT ? "INSERT" : "DELETE"),
-                (long long)(entry.ts.tv_sec), entry.ts.tv_nsec,
-                entry.entry.description.c_str());
-        }
-    }
+       for (auto entry : mEntryHistory) {
+               if (entry.entry.ptr == ptr) {
+                       LOGD("Heap history record for %p : %s, %lld.%.9ld, %s",
+                               ptr,
+                               (entry.operation == EntryOperation::INSERT ? "INSERT" : "DELETE"),
+                               (long long)(entry.ts.tv_sec), entry.ts.tv_nsec,
+                               entry.entry.description.c_str());
+               }
+       }
 #endif
-    if (mManagedTable.find(ptr) != mManagedTable.end()) {
-        return mManagedTable[ptr].description;
-    }
-    return std::string("Not found");
+       if (mManagedTable.find(ptr) != mManagedTable.end()) {
+               return mManagedTable[ptr].description;
+       }
+       return std::string("Not found");
 }
 
 void HeapTracer::MarkUnmanaged(void *ptr, std::string description)
 {
-    LOGD("Marking as unmanaged : %p %s", ptr, description.c_str());
-
-    std::lock_guard<std::mutex> lock(mManagedTableMutex);
-    auto iter = mManagedTable.find(ptr);
-    if (iter != mManagedTable.end()) {
-        if (RECORD_UNMANAGED_CHUNKS) {
-            std::lock_guard<std::mutex> lock(mUnmanagedRecordsMutex);
-            if (mUnmanagedRecordsSize >= MAX_UNMANAGED_RECORDS) {
-                mUnmanagedRecords.pop_front();
-                mUnmanagedRecordsSize--;
-            }
-            mUnmanagedRecords.push_back(iter->second);
-            mUnmanagedRecordsSize++;
-        }
-        mManagedTable.erase(ptr);
-    } else {
-        LOGE("Heap Trace Error : Trying to mark an entry that does not exist as unmanaged : %p", ptr);
-    }
+       LOGD("Marking as unmanaged : %p %s", ptr, description.c_str());
+
+       std::lock_guard<std::mutex> lock(mManagedTableMutex);
+       auto iter = mManagedTable.find(ptr);
+       if (iter != mManagedTable.end()) {
+               if (RECORD_UNMANAGED_CHUNKS) {
+                       std::lock_guard<std::mutex> lock(mUnmanagedRecordsMutex);
+                       if (mUnmanagedRecordsSize >= MAX_UNMANAGED_RECORDS) {
+                               mUnmanagedRecords.pop_front();
+                               mUnmanagedRecordsSize--;
+                       }
+                       mUnmanagedRecords.push_back(iter->second);
+                       mUnmanagedRecordsSize++;
+               }
+               mManagedTable.erase(ptr);
+       } else {
+               LOGE("Heap Trace Error : Trying to mark an entry that does not exist as unmanaged : %p", ptr);
+       }
 }
 
 bool HeapTracer::Empty()
 {
-    std::lock_guard<std::mutex> lock(mManagedTableMutex);
-    return mManagedTable.empty();
+       std::lock_guard<std::mutex> lock(mManagedTableMutex);
+       return mManagedTable.empty();
 }
 
 void HeapTracer::Trace()
 {
-    LOGD("Heap Trace Start");
+       LOGD("Heap Trace Start");
 
-    std::lock_guard<std::mutex> lock(mManagedTableMutex);
-    for (auto item : mManagedTable) {
-        LOGD("No dealloc information exists for %p [size %d] : %s", item.first, item.second.size, item.second.description.c_str());
-    }
-    LOGD("Heap Trace End");
+       std::lock_guard<std::mutex> lock(mManagedTableMutex);
+       for (auto item : mManagedTable) {
+               LOGD("No dealloc information exists for %p [size %d] : %s", item.first, item.second.size, item.second.description.c_str());
+       }
+       LOGD("Heap Trace End");
 }
index e1ee0a6..01cac4d 100644 (file)
@@ -45,7 +45,7 @@ int mas_dbus_reconnect()
        bool sender_connected = dbus_connection_get_is_connected(g_conn_sender);
        bool listener_connected = dbus_connection_get_is_connected(g_conn_listener);
        MAS_LOGW("[DBUS] Sender(%s) Listener(%s)",
-                sender_connected ? "Connected" : "Not connected", listener_connected ? "Connected" : "Not connected");
+               sender_connected ? "Connected" : "Not connected", listener_connected ? "Connected" : "Not connected");
 
        if (false == sender_connected || false == listener_connected) {
                mas_dbus_close_connection();
@@ -565,10 +565,10 @@ int masc_ui_dbus_send_asr_result(int pid, int event, char* asr_result)
        DBusMessage* msg;
 
        msg = dbus_message_new_method_call(
-                         MA_UI_CLIENT_SERVICE_NAME,
-                         MA_UI_CLIENT_SERVICE_OBJECT_PATH,
-                         MA_UI_CLIENT_SERVICE_INTERFACE,
-                         MAS_UI_METHOD_SEND_ASR_RESULT);
+                       MA_UI_CLIENT_SERVICE_NAME,
+                       MA_UI_CLIENT_SERVICE_OBJECT_PATH,
+                       MA_UI_CLIENT_SERVICE_INTERFACE,
+                       MAS_UI_METHOD_SEND_ASR_RESULT);
 
        if (NULL == msg) {
                MAS_LOGE("@@ Request multi-assistant send ASR result : Fail to make message");
@@ -619,10 +619,10 @@ int masc_ui_dbus_send_result(int pid, const char* display_text, const char* utte
        DBusMessage* msg;
 
        msg = dbus_message_new_method_call(
-                         MA_UI_CLIENT_SERVICE_NAME,
-                         MA_UI_CLIENT_SERVICE_OBJECT_PATH,
-                         MA_UI_CLIENT_SERVICE_INTERFACE,
-                         MAS_UI_METHOD_SEND_RESULT);
+                       MA_UI_CLIENT_SERVICE_NAME,
+                       MA_UI_CLIENT_SERVICE_OBJECT_PATH,
+                       MA_UI_CLIENT_SERVICE_INTERFACE,
+                       MAS_UI_METHOD_SEND_RESULT);
 
        if (NULL == msg) {
                MAS_LOGE("@@ Request multi-assistant send result : Fail to make message");
@@ -718,10 +718,10 @@ int masc_ui_dbus_change_assistant(char* app_id)
        DBusMessage* msg;
 
        msg = dbus_message_new_method_call(
-                         MA_UI_CLIENT_SERVICE_NAME,
-                         MA_UI_CLIENT_SERVICE_OBJECT_PATH,
-                         MA_UI_CLIENT_SERVICE_INTERFACE,
-                         MAS_UI_METHOD_CHANGE_ASSISTANT);
+                       MA_UI_CLIENT_SERVICE_NAME,
+                       MA_UI_CLIENT_SERVICE_OBJECT_PATH,
+                       MA_UI_CLIENT_SERVICE_INTERFACE,
+                       MAS_UI_METHOD_CHANGE_ASSISTANT);
 
        dbus_message_append_args(msg,
                DBUS_TYPE_STRING, &app_id,
@@ -799,10 +799,10 @@ int masc_ui_dbus_send_recognition_result(int pid, int result)
        DBusMessage* msg;
 
        msg = dbus_message_new_method_call(
-                         MA_UI_CLIENT_SERVICE_NAME,
-                         MA_UI_CLIENT_SERVICE_OBJECT_PATH,
-                         MA_UI_CLIENT_SERVICE_INTERFACE,
-                         MAS_UI_METHOD_SEND_RECOGNITION_RESULT);
+                       MA_UI_CLIENT_SERVICE_NAME,
+                       MA_UI_CLIENT_SERVICE_OBJECT_PATH,
+                       MA_UI_CLIENT_SERVICE_INTERFACE,
+                       MAS_UI_METHOD_SEND_RECOGNITION_RESULT);
 
        if (NULL == msg) {
                MAS_LOGE("@@ Request multi-assistant send recognition result : Fail to make message");
@@ -840,10 +840,10 @@ int masc_ui_dbus_enable_common_ui(int enable)
        DBusMessage* msg;
 
        msg = dbus_message_new_method_call(
-                         MA_UI_CLIENT_SERVICE_NAME,
-                         MA_UI_CLIENT_SERVICE_OBJECT_PATH,
-                         MA_UI_CLIENT_SERVICE_INTERFACE,
-                         MAS_UI_METHOD_ENABLE_COMMON_UI);
+                       MA_UI_CLIENT_SERVICE_NAME,
+                       MA_UI_CLIENT_SERVICE_OBJECT_PATH,
+                       MA_UI_CLIENT_SERVICE_INTERFACE,
+                       MAS_UI_METHOD_ENABLE_COMMON_UI);
 
        if (NULL == msg) {
                MAS_LOGE("@@ Request multi-assistant enable common ui : Fail to make message");
index 892eed3..f07d730 100644 (file)
@@ -694,7 +694,7 @@ int multi_assistant_service_plugin_activate(void)
        int ret = -1;
        if (NULL != g_handle) {
                wakeup_manager_activate func = _wakeup_manager_interface.activate;
-                if (NULL == func) {
+               if (NULL == func) {
                        MAS_LOGE("[ERROR] symbol lookup failed : %s", MA_WAKEUP_MANAGER_FUNC_ACTIVATE);
                } else {
                        ret = func();
@@ -713,7 +713,7 @@ int multi_assistant_service_plugin_deactivate(void)
        int ret = -1;
        if (NULL != g_handle) {
                wakeup_manager_deactivate func = _wakeup_manager_interface.deactivate;
-                if (NULL == func) {
+               if (NULL == func) {
                        MAS_LOGE("[ERROR] symbol lookup failed : %s", MA_WAKEUP_MANAGER_FUNC_DEACTIVATE);
                } else {
                        ret = func();
@@ -732,7 +732,7 @@ int multi_assistant_service_plugin_update_voice_feedback_state(const char* appid
        int ret = -1;
        if (NULL != g_handle) {
                wakeup_manager_update_voice_feedback_state func = _wakeup_manager_interface.update_voice_feedback_state;
-                if (NULL == func) {
+               if (NULL == func) {
                        MAS_LOGE("[ERROR] symbol lookup failed : %s", MA_WAKEUP_MANAGER_FUNC_UPDATE_VOICE_FEEDBACK_STATE);
                } else {
                        ret = func(appid, state);
@@ -751,7 +751,7 @@ int multi_assistant_service_plugin_send_assistant_specific_command(const char* a
        int ret = -1;
        if (NULL != g_handle) {
                wakeup_manager_send_assistant_specific_command func = _wakeup_manager_interface.send_assistant_specific_command;
-                if (NULL == func) {
+               if (NULL == func) {
                        MAS_LOGE("[ERROR] symbol lookup failed : %s", MA_WAKEUP_MANAGER_FUNC_SEND_ASSISTANT_SPECIFIC_COMMAND);
                } else {
                        ret = func(appid, command);
@@ -770,7 +770,7 @@ int multi_assistant_service_plugin_set_background_volume(const char* appid, doub
        int ret = -1;
        if (NULL != g_handle) {
                wakeup_manager_set_background_volume func = _wakeup_manager_interface.set_background_volume;
-                if (NULL == func) {
+               if (NULL == func) {
                        MAS_LOGE("[ERROR] symbol lookup failed : %s", MA_WAKEUP_MANAGER_FUNC_SET_BACKGROUND_VOLUME);
                } else {
                        ret = func(appid, ratio);
@@ -789,7 +789,7 @@ int multi_assistant_service_plugin_update_recognition_result(const char* appid,
        int ret = -1;
        if (NULL != g_handle) {
                wakeup_manager_update_recognition_result func = _wakeup_manager_interface.update_recognition_result;
-                if (NULL == func) {
+               if (NULL == func) {
                        MAS_LOGE("[ERROR] symbol lookup failed : %s", MA_WAKEUP_MANAGER_FUNC_UPDATE_RECOGNITION_RESULT);
                } else {
                        ret = func(appid, state);
@@ -808,7 +808,7 @@ int multi_assistant_service_plugin_process_event(int event, void *data, int len)
        int ret = -1;
        if (NULL != g_handle) {
                wakeup_manager_process_event func = _wakeup_manager_interface.process_event;
-                if (NULL == func) {
+               if (NULL == func) {
                        MAS_LOGE("[ERROR] symbol lookup failed : %s", MA_WAKEUP_MANAGER_FUNC_PROCESS_EVENT);
                } else {
                        ret = func(event, data, len);