From bde92c5b26e92f7564e8d3a24c53b38e983d5968 Mon Sep 17 00:00:00 2001 From: "sooyeon.kim" Date: Thu, 29 Sep 2016 15:24:48 +0900 Subject: [PATCH] Fix buxton key layer Change-Id: I0eae5d7fdcc4b6c95a2f6045031e31a28dd8f2fe Signed-off-by: sooyeon.kim --- client/stt.c | 2 +- client/stt_dbus.c | 6 +++--- common/stt_config_mgr.c | 2 +- org.tizen.voice.sttserver.service | 2 +- org.tizen.voice.sttservercustom.service | 2 +- packaging/stt.spec | 6 ------ server/sttd_dbus.c | 2 +- 7 files changed, 8 insertions(+), 14 deletions(-) diff --git a/client/stt.c b/client/stt.c index 5135afe..faf821f 100644 --- a/client/stt.c +++ b/client/stt.c @@ -519,7 +519,7 @@ int __stt_set_buxtonkey(const char* engine_id) return STT_ERROR_OPERATION_FAILED; } SLOG(LOG_DEBUG, stt_tag(), "[DBUS-BUXTON2] buxton_open: %d", ret); - bux_layer = buxton_create_layer("user"); + bux_layer = buxton_create_layer("system"); if (NULL == bux_layer) { SLOG(LOG_ERROR, stt_tag(), "[DBUS-BUXTON2] buxton_create_layer FAIL"); buxton_close(bux_cli); diff --git a/client/stt_dbus.c b/client/stt_dbus.c index e5e7e3b..5801649 100644 --- a/client/stt_dbus.c +++ b/client/stt_dbus.c @@ -58,7 +58,7 @@ char* __stt_get_service_name(char* engine_id) return NULL; } SLOG(LOG_DEBUG, TAG_STTC, "[DBUS-BUXTON2] buxton_open: %d", ret); - bux_layer = buxton_create_layer("user"); + bux_layer = buxton_create_layer("system"); if (NULL == bux_layer) { SLOG(LOG_ERROR, TAG_STTC, "[DBUS-BUXTON2] buxton_create_layer FAIL"); buxton_close(bux_cli); @@ -160,7 +160,7 @@ char* __stt_get_service_object(char* engine_id) SLOG(LOG_ERROR, TAG_STTC, "[DBUS-BUXTON2] Fail to open buxton client, ret(%d)", ret); return NULL; } - bux_layer = buxton_create_layer("user"); + bux_layer = buxton_create_layer("system"); if (NULL == bux_layer) { SLOG(LOG_DEBUG, TAG_STTC, "[DBUS-BUXTON2] buxton_create_layer FAIL"); buxton_close(bux_cli); @@ -261,7 +261,7 @@ char* __stt_get_service_interface(char* engine_id) SLOG(LOG_ERROR, TAG_STTC, "[DBUS-BUXTON2] Fail to open buxton client, ret(%d)", ret); return NULL; } - bux_layer = buxton_create_layer("user"); + bux_layer = buxton_create_layer("system"); if (NULL == bux_layer) { SLOG(LOG_ERROR, TAG_STTC, "[DBUS-BUXTON2] buxton_create_layer FAIL"); buxton_close(bux_cli); diff --git a/common/stt_config_mgr.c b/common/stt_config_mgr.c index b8162e8..d7e3105 100644 --- a/common/stt_config_mgr.c +++ b/common/stt_config_mgr.c @@ -1073,7 +1073,7 @@ int __stt_config_set_buxtonkey(const char* engine) SLOG(LOG_ERROR, stt_tag(), "[DBUS-BUXTON2] Fail to open buxton client, ret(%d)", ret); return STT_CONFIG_ERROR_OPERATION_FAILED; } - bux_layer = buxton_create_layer("user"); + bux_layer = buxton_create_layer("system"); if (NULL == bux_layer) { SLOG(LOG_ERROR, stt_tag(), "[DBUS-BUXTON2] buxton_create_layer FAIL"); buxton_close(bux_cli); diff --git a/org.tizen.voice.sttserver.service b/org.tizen.voice.sttserver.service index dc7e2d4..e8a8f3c 100644 --- a/org.tizen.voice.sttserver.service +++ b/org.tizen.voice.sttserver.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.tizen.voice.sttserver #Exec=/bin/sh -c "launch_app org.tizen.stt-engine-default" -Exec=/bin/sh -c "voice_getengine get user db/voice/stt/engine/default | awk '{print$5}' | xargs -t -i launch_app {}" +Exec=/bin/sh -c "voice_getengine get system db/voice/stt/engine/default | awk '{print$5}' | xargs -t -i launch_app {}" diff --git a/org.tizen.voice.sttservercustom.service b/org.tizen.voice.sttservercustom.service index 87509eb..1529afe 100644 --- a/org.tizen.voice.sttservercustom.service +++ b/org.tizen.voice.sttservercustom.service @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.tizen.voice.sttservercustom -Exec=/bin/sh -c "voice_getengine get user db/voice/stt/engine/custom | awk '{print$5}' | xargs -t -i launch_app {}" +Exec=/bin/sh -c "voice_getengine get system db/voice/stt/engine/custom | awk '{print$5}' | xargs -t -i launch_app {}" diff --git a/packaging/stt.spec b/packaging/stt.spec index 8ce6024..5746a07 100644 --- a/packaging/stt.spec +++ b/packaging/stt.spec @@ -113,12 +113,6 @@ mkdir -p %{_libdir}/voice/ mkdir -p %{TZ_SYS_RO_SHARE}/voice/test -# buxton2ctl create-string # -#buxton2ctl create-string "user" "db/voice/stt/engine/default" "org.tizen.stt-engine-default" "http://tizen.org/privilege/internal/buxton" "http://tizen.org/privilege/internal/buxton" -buxton2ctl create-string "user" "db/voice/stt/engine/default" "org.tizen.stt-engine-default" "http://tizen.org/privilege/internal/default/public" "http://tizen.org/privilege/internal/default/platform" -buxton2ctl create-string "user" "db/voice/stt/engine/custom" "org.tizen.stt-engine-default" "http://tizen.org/privilege/internal/default/public" "http://tizen.org/privilege/recorder" -#buxton2ctl create-string "user" "db/voice/stt/engine/custom" "org.tizen.stt-engine-default" "http://tizen.org/privilege/internal/buxton" "http://tizen.org/privilege/internal/buxton" - %postun -p /sbin/ldconfig %files diff --git a/server/sttd_dbus.c b/server/sttd_dbus.c index b4d7d10..40d47e3 100644 --- a/server/sttd_dbus.c +++ b/server/sttd_dbus.c @@ -471,7 +471,7 @@ int __sttd_get_buxtonkey() SLOG(LOG_ERROR, TAG_STTD, "[DBUS-BUXTON2] Fail to open buxton client, ret(%d)", ret); return STTD_ERROR_OPERATION_FAILED; } - bux_layer = buxton_create_layer("user"); + bux_layer = buxton_create_layer("system"); if (NULL == bux_layer) { SLOG(LOG_ERROR, TAG_STTD, "[DBUS-BUXTON2] buxton_create_layer FAIL"); buxton_close(bux_cli); -- 2.7.4