Commit Graph

25687 Commits

Author SHA1 Message Date
zhaoyuan17 74fb70b225 GetSystemMemoryAttr interface implementation
Signed-off-by: zhaoyuan17 <zhaoyuan17@huawei.com>
2021-11-24 09:13:42 +00:00
openharmony_ci b7705498d8 !183 modify resume mission timer
Merge pull request !183 from blackleon/update_master_1123
2021-11-23 12:55:32 +00:00
zhaoyuan17 5ced324594 Modify resume mission timer
Signed-off-by: zhaoyuan17 <zhaoyuan17@huawei.com>
2021-11-23 17:18:09 +00:00
openharmony_ci ebb0f83fd0 !181 fms
Merge pull request !181 from blackleon/fms_1111
2021-11-11 14:31:10 +00:00
zhaoyuan17@huawei.com f43b488668 fms
Signed-off-by: zhaoyuan17@huawei.com <zhaoyuan17@huawei.com>
2021-11-11 19:33:40 +08:00
openharmony_ci 4303716d8c !179 Skill test modified
Merge pull request !179 from blackleon/master_1109_1
2021-11-10 06:20:06 +00:00
zhaoyuan17 8043b095d6 Skill test modified
Signed-off-by: zhaoyuan17 <zhaoyuan17@huawei.com>
2021-11-09 19:26:18 +00:00
openharmony_ci 345e0004e2 !175 Napi_getwantcommon modify
Merge pull request !175 from blackleon/update_code_1108
2021-11-08 12:07:17 +00:00
zhaoyuan17 a6cc7e95bf Napi_getwantcommon modify
Signed-off-by: zhaoyuan17 <zhaoyuan17@huawei.com>
2021-11-08 14:03:06 +00:00
openharmony_ci 64745dccb2 !173 Modify test code
Merge pull request !173 from blackleon/master_1108
2021-11-08 12:06:47 +00:00
openharmony_ci 8f7130297a !172 Change test
Merge pull request !172 from blackleon/update_master_1105_2
2021-11-08 07:57:25 +00:00
zhaoyuan17 7fc9f6aeed Fix codex
Signed-off-by: zhaoyuan17 <zhaoyuan17@huawei.com>
2021-11-08 14:35:58 +08:00
zhaoyuan17 e3fec09cfe Fix codex
Signed-off-by: zhaoyuan17 <zhaoyuan17@huawei.com>
2021-11-08 13:47:34 +08:00
zhaoyuan17 196e06c129 Modify test code
Signed-off-by: zhaoyuan17 <zhaoyuan17@huawei.com>
2021-11-08 10:56:54 +08:00
zhaoyuan17 9780be0370 Change test
Signed-off-by: zhaoyuan17 <zhaoyuan17@huawei.com>
2021-11-05 17:01:11 +00:00
openharmony_ci acf47f54e0 !171 Modify data saving asynchronous bug
Merge pull request !171 from blackleon/update_master_1105
2021-11-05 08:52:03 +00:00
zhaoyuan17 a63ab037ff Modify data saving asynchronous bug
Signed-off-by: zhaoyuan17 <zhaoyuan17@huawei.com>
2021-11-05 12:10:30 +00:00
openharmony_ci 36152c2b1d !168 Support -D option for aa start command
Merge pull request !168 from blackleon/update_master_1103
2021-11-05 02:57:16 +00:00
zhaoyuan17 7c9457fa1c Support -D option for aa start command
Signed-off-by: zhaoyuan17 <zhaoyuan17@huawei.com>
2021-11-04 10:13:20 +00:00
openharmony_ci f246eb5804 !167 fms_ST
Merge pull request !167 from blackleon/fms_1102_1
2021-11-03 06:13:28 +00:00
openharmony_ci 99f5e80b4e !163 change ut test
Merge pull request !163 from blackleon/master_1102
2021-11-03 03:46:05 +00:00
zhaoyuan17@huawei.com aab955e63d fms_st
Signed-off-by: zhaoyuan17@huawei.com <zhaoyuan17@huawei.com>
2021-11-03 09:55:23 +08:00
zhaoyuan17@huawei.com 8d45b14aac fms_st
Signed-off-by: zhaoyuan17@huawei.com <zhaoyuan17@huawei.com>
2021-11-03 09:13:38 +08:00
zhaoyuan17 6caea6b330 Modify codex
Signed-off-by: zhaoyuan17 <zhaoyuan17@huawei.com>
2021-11-02 16:35:22 +00:00
zhaoyuan17 e565742dd0 Modify test code
Signed-off-by: zhaoyuan17 <zhaoyuan17@huawei.com>
2021-11-02 13:20:59 +00:00
zhaoyuan17@huawei.com 682bc46298 fms_st
Signed-off-by: zhaoyuan17@huawei.com <zhaoyuan17@huawei.com>
2021-11-02 21:09:39 +08:00
zhaoyuan17@huawei.com 35fcb7c785 fms_st
Signed-off-by: zhaoyuan17@huawei.com <zhaoyuan17@huawei.com>
2021-11-02 15:06:13 +08:00
openharmony_ci 9769e1ac7e !159 Update configuration bug
Merge pull request !159 from blackleon/master_1030
2021-10-30 13:53:03 +00:00
zhaoyuan17 eae4b8d1b2 modify configuration bug
Signed-off-by: zhaoyuan17 <zhaoyuan17@huawei.com>
2021-10-30 14:29:52 +00:00
openharmony_ci 42227e738a !149 Start phone service
Merge pull request !149 from 李诗伟/master
2021-10-30 08:53:40 +00:00
openharmony_ci 6019dae23a !158 napi thread problem and codex and modify test code
Merge pull request !158 from blackleon/for_master_1029
2021-10-29 11:40:36 +00:00
zhaoyuan17 493627a6fb napi thread problem and codex and modify test code
Signed-off-by: zhaoyuan17 <zhaoyuan17@huawei.com>
2021-10-29 16:29:42 +00:00
openharmony_ci df981526b9 !157 回退 'Pull Request !153 : Test codex for aa'
Merge pull request !157 from gwang/revert-merge-153-master
2021-10-29 08:15:17 +00:00
gwang 1f23ca88ac 回退 'Pull Request !153 : Test codex for aa' 2021-10-29 08:14:00 +00:00
openharmony_ci 4b49627d3f !153 Test codex for aa
Merge pull request !153 from blackleon/master_1027
2021-10-29 06:07:22 +00:00
ohos-lsw 10775773c4 Start phone service
Signed-off-by: ohos-lsw <lishiwei6@huawei.com>
2021-10-29 10:04:22 +08:00
zhaoyuan17 f697c25f9d Test codex
Signed-off-by: zhaoyuan17 <zhaoyuan17@huawei.com>
2021-10-27 10:03:09 +08:00
ohos-lsw 3a14db3c83 Start phone service
Signed-off-by: ohos-lsw <lishiwei6@huawei.com>
2021-10-26 19:59:24 +08:00
ohos-lsw c58d815d69 Start phone service
Signed-off-by: ohos-lsw <lishiwei6@huawei.com>
2021-10-26 16:11:44 +08:00
openharmony_ci d2fe1da8b0 !144 modify floating terminate code
Merge pull request !144 from blackleon/master_1020
2021-10-22 06:14:28 +00:00
openharmony_ci 26158db56b !145 fms st
Merge pull request !145 from blackleon/master_fms_1020
2021-10-21 11:33:06 +00:00
openharmony_ci a13193ac87 !140 samgr part name rectify
Merge pull request !140 from zmx/master-dev
2021-10-21 01:40:26 +00:00
zhaoyuan17 dd341e38e2 services/abilitymgr/src/ability_stack_manager.cpp
Signed-off-by: zhaoyuan17 <zhaoyuan17@huawei.com>
2021-10-20 15:09:58 +00:00
zhaoyuan17@huawei.com f112c4818a fms merge
Signed-off-by: zhaoyuan17@huawei.com <zhaoyuan17@huawei.com>
2021-10-20 17:29:51 +08:00
openharmony_ci 6ded96bd80 !141 多模提交联调代码
Merge pull request !141 from licheng_1123/multimodal_1018
2021-10-20 08:36:59 +00:00
songliy 549c8eb7a8 多模修改aafwk告警
Signed-off-by: licheng.li <licheng.li@huawei.com>
2021-10-19 14:14:04 +08:00
songliy cfec5c4ce9 多模修改aafwk告警
Signed-off-by: licheng.li <licheng.li@huawei.com>
2021-10-19 10:33:30 +08:00
songliy a87556f860 多模修改aafwk告警
Signed-off-by: licheng.li <licheng.li@huawei.com>
2021-10-19 10:31:35 +08:00
songliy 477ae75325 多模提交联调代码
Signed-off-by: licheng.li <licheng.li@huawei.com>
2021-10-18 21:28:20 +08:00
zmx b1d1ca55dd samgr part name rectify
Signed-off-by: zmx <1029211721@qq.com>
Change-Id: I9a8fd390d1544dff8e26b9ebcd0f7de04896612c
2021-10-18 16:47:49 +08:00