Merge branch 'tizen_6.0' into tizen

Change-Id: I2c44df5e7ef24912a69893bb8ae078d8a2aede43

diff --git a/doc/inputmethod_doc.h b/doc/inputmethod_doc.h
index 6dfde6a..7e481ad 100644 (file)
--- a/doc/inputmethod_doc.h
+++ b/doc/inputmethod_doc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2014-2021 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.

diff --git a/inputmethod/include/inputmethod.h b/inputmethod/include/inputmethod.h
index e2baa2d..ecd3b36 100644 (file)
--- a/inputmethod/include/inputmethod.h
+++ b/inputmethod/include/inputmethod.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2014-2021 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.

diff --git a/inputmethod/include/inputmethod_device_event.h b/inputmethod/include/inputmethod_device_event.h
index 4aefb89..0a00338 100644 (file)
--- a/inputmethod/include/inputmethod_device_event.h
+++ b/inputmethod/include/inputmethod_device_event.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2016-2021 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.

diff --git a/inputmethod/include/inputmethod_internal.h b/inputmethod/include/inputmethod_internal.h
index 08caaf5..3cf056a 100644 (file)
--- a/inputmethod/include/inputmethod_internal.h
+++ b/inputmethod/include/inputmethod_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2014-2021 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.

diff --git a/inputmethod/include/inputmethod_keydef.h b/inputmethod/include/inputmethod_keydef.h
index 9d266a9..6ef3815 100644 (file)
--- a/inputmethod/include/inputmethod_keydef.h
+++ b/inputmethod/include/inputmethod_keydef.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2015-2021 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.

diff --git a/inputmethod/include/inputmethod_private.h b/inputmethod/include/inputmethod_private.h
index 75ef7ab..ec3ae18 100644 (file)
--- a/inputmethod/include/inputmethod_private.h
+++ b/inputmethod/include/inputmethod_private.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2014-2021 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.

diff --git a/inputmethod/src/inputmethod.cpp b/inputmethod/src/inputmethod.cpp
index 69c8881..77d0a53 100644 (file)
--- a/inputmethod/src/inputmethod.cpp
+++ b/inputmethod/src/inputmethod.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2015-2021 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.
@@ -1412,7 +1412,7 @@ EXPORT_API int ime_set_selection(int start, int end)
     retVal = _check_privilege();
     if (retVal != IME_ERROR_NONE) return retVal;
 
-    LOGI("start: %d, end : %d", start, end);
+    SECURE_LOGI("start: %d, end : %d", start, end);
     g_core.set_selection(start, end);
 
     return IME_ERROR_NONE;
@@ -1780,7 +1780,7 @@ EXPORT_API int ime_commit_content(const char *content, const char *description,
     }
 
     //LCOV_EXCL_START
-    LOGI("content : '%s', description : '%s', mime_type : '%s'", content, description, mime_type);
+    SECURE_LOGI("content : '%s', description : '%s', mime_type : '%s'", content, description, mime_type);
     g_core.commit_content(content, description, mime_type);
 
     return IME_ERROR_NONE;
@@ -2358,11 +2358,9 @@ EXPORT_API int ime_event_set_optimization_hint_set_cb(ime_optimization_hint_set_
         return IME_ERROR_INVALID_PARAMETER;
     }
 
-    LOGD("");
     retVal = _check_privilege();
     if (retVal != IME_ERROR_NONE) return retVal;
 
-    LOGD("");
     g_event_callback.optimization_hint_set = callback_func;
     g_event_callback.optimization_hint_set_user_data = user_data;