Merge "Fix incorrect log message" into tizen_5.5
authorJi-hoon Lee <dalton.lee@samsung.com>
Fri, 10 Apr 2020 00:13:34 +0000 (00:13 +0000)
committerGerrit Code Review <gerrit@review>
Fri, 10 Apr 2020 00:13:34 +0000 (00:13 +0000)
1  2 
src/multi_assistant_service.c

@@@ -742,11 -742,6 +742,11 @@@ static int init_plugin(void
                return -1;
        }
  
 +      memset(&g_maclient_info, 0x00, sizeof(g_maclient_info));
 +      g_current_maclient_info = -1;
 +      g_current_preprocessing_maclient_info = -1;
 +      g_wakeup_maclient_appid = NULL;
 +
        if (0 == mas_config_get_assistant_info(__mas_assistant_info_cb, NULL)) {
                for (int loop = 0; loop < MAX_MACLIENT_INFO_NUM; loop++) {
                        int inner_loop;
@@@ -1208,8 -1203,7 +1208,8 @@@ int mas_update_voice_key_support_mode(
        if (0 == multi_assistant_service_plugin_get_default_assistant(&default_assistant)) {
                for (int loop = 0; loop < MAX_MACLIENT_INFO_NUM; loop++) {
                        if (g_maclient_info[loop].used) {
 -                              if (strncmp(default_assistant, g_maclient_info[loop].appid, MAX_APPID_LEN) == 0) {
 +                              if (default_assistant &&
 +                                      strncmp(default_assistant, g_maclient_info[loop].appid, MAX_APPID_LEN) == 0) {
                                        float duration = g_maclient_info[loop].voice_key_tap_duration;
                                        if (0.0f < duration) {
                                                multi_assistant_service_plugin_set_voice_key_tap_duration(duration);
@@@ -1451,7 -1445,7 +1451,7 @@@ static void _package_manager_event_cb(c
                type, package, event_type, event_state, progress, error);
        ret = pkgmgrinfo_pkginfo_get_pkginfo(package, &handle);
        if (ret != PMINFO_R_OK || NULL == handle) {
-               LOGW("Failed to call pkgmgrinfo_pkginfo_get_pkginfo & get_usr_pkginfo(\"%s\",~) returned %d, uid : %d", package, ret, getuid ());
+               LOGW("Failed to call pkgmgrinfo_pkginfo_get_pkginfo(\"%s\",~) returned %d", package, ret);
                /* Try to get in user packages */
                user = true;
                ret = pkgmgrinfo_pkginfo_get_usr_pkginfo (package, uid, &handle);