Commit Graph

3193 Commits

Author SHA1 Message Date
openharmony_ci
1d38e10fa0
!1481 [Bug]: 修复GetStringById&更新default full判断 挑单5.0release
Merge pull request !1481 from wangdongqi/OpenHarmony-5.0-Release
2024-09-19 11:26:17 +00:00
wangdongqi
26f97d4016 Signed-off-by: wangdongqi <wangdongqi2@huawei.com>
Changes to be committed:
2024-09-19 18:04:44 +08:00
openharmony_ci
864646a434
!1474 修改代码差异
Merge pull request !1474 from shenpeixing/OpenHarmony-5.0-Release
2024-09-18 06:41:20 +00:00
openharmony_ci
f842164766
!1472 安全告警清零
Merge pull request !1472 from wangdongqi/cherry-pick-1726109808
2024-09-18 03:34:31 +00:00
shenpeixing
4e9d7f70f7 修改黄蓝差异
Signed-off-by: shenpeixing <shenpeixing2@huawei.com>
2024-09-14 09:25:54 +08:00
openharmony_ci
2e7a49636c
!1464 修改蓝黄代码差异
Merge pull request !1464 from shenpeixing/OpenHarmony-5.0-Release
2024-09-13 07:39:36 +00:00
shenpeixing
9f3eaa27a5 修改黄蓝代码差异
Signed-off-by: shenpeixing <shenpeixing2@huawei.com>
2024-09-13 09:01:38 +08:00
openharmony_ci
4e51484d15
!1469 修改crash
Merge pull request !1469 from mashaoyin/OpenHarmony-5.0-Release
2024-09-12 08:59:26 +00:00
shenpeixing
c0757c4906 修改黄蓝差异
Signed-off-by: shenpeixing <shenpeixing2@huawei.com>
2024-09-12 15:06:47 +08:00
shenpeixing
7105d8f670 增加进程pid校验
Signed-off-by: shenpeixing <shenpeixing2@huawei.com>
2024-09-12 14:49:46 +08:00
wangdongqi
4b5a03fc15 Signed-off-by: wangdongqi <wangdongqi2@huawei.com>
(cherry picked commit from <gitee.com//openharmony/inputmethod_imf/commit/afe6cd69812996260a29de0445755d3876d9978a>
2024-09-12 02:56:50 +00:00
openharmony_ci
e647a7db6b
!1466 labelId适配 5.0-release
Merge pull request !1466 from wangdongqi/OpenHarmony-5.0-Release
2024-09-11 02:02:56 +00:00
openharmony_ci
a852378aac
!1345 【5.0release】保证所有拉起流程都在停止流程彻底结束后
Merge pull request !1345 from cy7717/OpenHarmony-5.0-Release
2024-09-10 09:49:45 +00:00
ma-shaoyin
7f8d502b55 Signed-off-by: ma-shaoyin <mashaoyin1@huawei.com>
Changes to be committed:
2024-09-10 16:30:59 +08:00
openharmony_ci
b0190a83f5
!1465 预制应用信息公示
Merge pull request !1465 from ZSY/OpenHarmony-5.0-Release
2024-09-10 08:06:31 +00:00
cy7717
aeb4ef9371 Merge branch 'OpenHarmony-5.0-Release' of gitee.com:openharmony/inputmethod_imf into OpenHarmony-5.0-Release
Signed-off-by: cy7717 <chenyu301@huawei.com>
2024-09-09 11:54:47 +00:00
wangdongqi
f2da97f399 Signed-off-by: wangdongqi <wangdongqi2@huawei.com>
Changes to be committed:
2024-09-09 19:39:27 +08:00
zhangsaiyang
af5501fa97 服务侧快捷切换校验锁屏状态
Signed-off-by: zhangsaiyang <zhangsaiyang@huawei.com>
2024-09-09 19:17:21 +08:00
openharmony_ci
481f667c76
!1452 Revert "!1231 improve basic code style" && Revert "!1285refactor:代码优化"
Merge pull request !1452 from weishaoxiong/OpenHarmony-5.0-Release
2024-09-07 09:56:14 +00:00
oh_ci
70c34034da
!1457 回退 'Pull Request !1450 : 挑单5.0'
Merge pull request !1457 from oh_ci/revert-merge-1450-OpenHarmony-5.0-Release
2024-09-06 12:57:49 +00:00
oh_ci
eb418207e7
回退 'Pull Request !1450 : 挑单5.0' 2024-09-06 12:44:14 +00:00
openharmony_ci
e79a71112a
!1450 挑单5.0
Merge pull request !1450 from hemenghao/OpenHarmony-5.0-Release
2024-09-06 11:42:26 +00:00
weishaoxiong
bde720d664 Merge branch 'OpenHarmony-5.0-Release' of gitee.com:openharmony/inputmethod_imf into OpenHarmony-5.0-Release
Signed-off-by: weishaoxiong <weishaoxiong2@huawei.com>
2024-09-06 11:25:09 +00:00
openharmony_ci
09cb506579
!1453 add force hide
Merge pull request !1453 from 吴成文/OpenHarmony-5.0-Release
2024-09-06 10:33:03 +00:00
wuchengwen
60d847db9d add force hide
Signed-off-by: wuchengwen <wuchengwen4@huawei.com>
2024-09-06 15:25:52 +08:00
weishaoxiong
69e7b73d2e Revert "improve basic code style"
This reverts commit 86234fa817.

# Conflicts:
#	common/include/message_handler.h
#	frameworks/js/napi/inputmethodability/js_panel.cpp
#	frameworks/js/napi/inputmethodability/js_text_input_client_engine.cpp
#	frameworks/js/napi/inputmethodability/js_text_input_client_engine.h
#	frameworks/js/napi/keyboardpanelmanager/js_keyboard_panel_manager.cpp
#	frameworks/native/inputmethod_ability/src/input_method_ability.cpp
#	frameworks/native/inputmethod_ability/src/input_method_panel.cpp
#	frameworks/native/inputmethod_controller/include/input_attribute.h
#	frameworks/native/inputmethod_controller/include/input_client_info.h
#	frameworks/native/inputmethod_controller/src/input_method_controller.cpp
#	frameworks/native/inputmethod_controller/src/keyevent_consumer_proxy.cpp
#	frameworks/native/inputmethod_controller/src/system_cmd_channel_proxy.cpp
#	interfaces/inner_api/inputmethod_controller/include/ime_system_channel.h
#	services/adapter/settings_data_provider/include/enable_ime_data_parser.h
#	services/adapter/settings_data_provider/src/enable_ime_data_parser.cpp
#	services/adapter/settings_data_provider/src/security_mode_parser.cpp
#	services/include/ime_info_inquirer.h
#	services/include/input_method_system_ability_stub.h
#	services/src/ime_info_inquirer.cpp
#	services/src/input_method_system_ability.cpp
#	services/src/input_method_system_ability_stub.cpp
#	services/src/peruser_session.cpp
Revert "!1285refactor:代码优化"

This reverts commit dad0cd2ffc, reversing
changes made to 180ed91d5f.

# Conflicts:
#	frameworks/js/napi/inputmethodability/js_panel.cpp
#	frameworks/js/napi/inputmethodability/js_text_input_client_engine.cpp
#	frameworks/js/napi/keyboardpanelmanager/js_keyboard_panel_manager.cpp
#	frameworks/native/inputmethod_ability/src/input_method_ability.cpp
#	frameworks/native/inputmethod_ability/src/input_method_panel.cpp
#	frameworks/native/inputmethod_controller/src/input_method_controller.cpp
#	services/adapter/settings_data_provider/src/enable_ime_data_parser.cpp
#	services/adapter/system_language_observer/src/system_language_observer.cpp
#	services/src/im_common_event_manager.cpp
#	services/src/ime_info_inquirer.cpp
#	services/src/input_method_system_ability.cpp
#	services/src/peruser_session.cpp

Signed-off-by: weishaoxiong <weishaoxiong2@huawei.com>
2024-09-06 15:23:30 +08:00
hemenghao
e7ec177c88 挑单5.0
Signed-off-by: hemenghao <hemenghao2@huawei.com>
2024-09-05 15:35:19 +08:00
cy7717
56887feb85 mod
Signed-off-by: cy7717 <chenyu301@huawei.com>
2024-09-04 13:32:47 +08:00
cy7717
04b8bd520a 保证所有拉起流程都在停止流程彻底结束后
Signed-off-by: cy7717 <chenyu301@huawei.com>
2024-09-03 20:34:08 +08:00
openharmony_ci
fba6da363b
!1437 【回合Release】fix RemoveDeathRecipient
Merge pull request !1437 from ht/OpenHarmony-5.0-Release
2024-09-02 10:09:30 +00:00
openharmony_ci
913b8ece42
!1433 修改空指针告警5-0release
Merge pull request !1433 from wangdongqi/cherry-pick-1724999840
2024-09-02 08:59:05 +00:00
htt1997
50309551b3 fix removeDeathRecipient
Signed-off-by: htt1997 <hutao105@huawei.com>
2024-09-02 15:53:03 +08:00
wangdongqi
a15e34ae61 Signed-off-by: wangdongqi <wangdongqi2@huawei.com>
(cherry picked commit from <gitee.com//openharmony/inputmethod_imf/commit/18232510094f2064c2545012d8115486b8fcd249>
2024-08-30 06:37:21 +00:00
openharmony_ci
be1393c42f
!1412 add capi
Merge pull request !1412 from 吴成文/OpenHarmony-5.0-Release
2024-08-28 08:09:30 +00:00
wuchengwen
798f1b64ee add capi
Signed-off-by: wuchengwen <wuchengwen4@huawei.com>
2024-08-28 14:56:30 +08:00
openharmony_ci
22c3f056fe
!1420 修改fuzz crash
Merge pull request !1420 from mashaoyin/OpenHarmony-5.0-Release
2024-08-28 04:44:38 +00:00
openharmony_ci
6520f94379
!1410 【回合release】异步请求串行化优化
Merge pull request !1410 from ht/OpenHarmony-5.0-Release
2024-08-27 10:07:16 +00:00
ma-shaoyin
8aa0e4003a Signed-off-by: ma-shaoyin <mashaoyin1@huawei.com>
Changes to be committed:
2024-08-27 14:49:11 +08:00
htt1997
29c7c38a52 fix UT
Signed-off-by: htt1997 <hutao105@huawei.com>
2024-08-25 11:19:15 +08:00
cy7717
604c3d0630 Merge branch 'OpenHarmony-5.0-Release' of gitee.com:openharmony/inputmethod_imf into OpenHarmony-5.0-Release
Signed-off-by: cy7717 <chenyu301@huawei.com>
2024-08-24 16:36:15 +00:00
htt1997
d248cbbff0 refactor:text input seq
Signed-off-by: htt1997 <hutao105@huawei.com>
2024-08-24 19:40:50 +08:00
openharmony_ci
fed7af083a
!1387 resize/moveto适配旋转
Merge pull request !1387 from hemenghao/OpenHarmony-5.0-Release
2024-08-23 04:45:09 +00:00
openharmony_ci
49bc575ddf
!1388 无效callingwindowId不设置
Merge pull request !1388 from 师瑜/OpenHarmony-5.0-Release
2024-08-22 08:49:34 +00:00
shiyu-shiyu
b77a11b357 无效callingwindowId不设置
Signed-off-by: shiyu-shiyu <shiyu52@huawei.com>
2024-08-21 15:42:56 +08:00
hemenghao
d040708180 adjust适配商分合入
Signed-off-by: hemenghao <hemenghao2@huawei.com>
2024-08-21 15:29:55 +08:00
openharmony_ci
62414d7cf5
!1375 fix:三方应用独立杀沙箱
Merge pull request !1375 from wTong888/OpenHarmony-5.0-Release
2024-08-19 04:12:07 +00:00
wTong888
5ab7335e60 fix:isolated sandbox
Signed-off-by: wTong888 <wangtong94@huawei.com>
2024-08-17 17:34:11 +08:00
openharmony_ci
5f5625a036
!1370 [5.0release]EnterKeyType新增换行功能定义
Merge pull request !1370 from 赵凌岚/OpenHarmony-5.0-Release
2024-08-15 11:51:19 +00:00
zhaolinglan
6636ec4708 add NEWLINE
Signed-off-by: zhaolinglan <zhaolinglan1@huawei.com>
2024-08-15 11:36:07 +08:00
cy7717
9526283c90 mod for mutiluser_part3
Signed-off-by: cy7717 <chenyu301@huawei.com>
2024-08-10 21:24:03 +08:00