Commit Graph

69 Commits

Author SHA1 Message Date
lu f6e26d2d4b Change 'RequestRotation' to 'SetOrientation'
Signed-off-by: lu <zhaolu2@huawei.com>
Change-Id: Icfeab91d336279f41f93bf2f293c6d9364459da5
2022-02-28 10:31:11 +08:00
openharmony_ci bbfba21c7e !358 fix window snapshot nullptr bug
Merge pull request !358 from Klaus_q/master_wq
2022-02-25 23:53:40 +00:00
openharmony_ci e20f415a61 !377 修复创建虚拟屏幕、动态设置surface不能传nullptr的问题,补充并完善ST
Merge pull request !377 from Grady/master
2022-02-25 16:03:37 +00:00
Klaus_q 370a879146 fix DMS inner temp code
Signed-off-by: Klaus_q <wangqi175@huawei.com>
Change-Id: Ida8b9d4a28dd8748a492b5ca68decab77ed41c87
2022-02-25 11:11:15 +08:00
Grady 808e617c15 modify surface nullptr
Signed-off-by: Grady <yangguangwei4@huawei.com>
Change-Id: I9736a6e48cfde5cb35354a2dcdc9dece1f3212b5
2022-02-24 20:41:45 +08:00
xiaojianfeng 4056556432 修改DisplayManagerAdapter
Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: I4875da8361455bbdcabfa569f07a08723216619e
2022-02-24 16:00:57 +08:00
lu 8cbbec0865 Add 'DisplayMove' interface to Window
Signed-off-by: lu <zhaolu2@huawei.com>
Change-Id: Ieaf19363ba09d3602a0239f10ed411d7134a7f45
2022-02-23 19:17:28 +08:00
xiahaiqin 13c802f60c modify deadlock between dms and wms
Signed-off-by: xiahaiqin <xiahaiqin1@huawei.com>
Change-Id: I638027f75d0181f6364a4406ef0ace4c573c0c4e
2022-02-23 15:10:48 +08:00
xiaojianfeng cef57bd91d modify the makemirror reture para type
Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: Ib5cd6d5a3927d200be1ec3f987d25e09238aa245
2022-02-22 17:51:17 +08:00
xiaojianfeng 0145973871 Revert "Revert "modify screenInfo, screengroupinfo, displayInfo, screen, screengroup, display""
This reverts commit 12460515d1.

Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: I1184ab3cd41d899759b83b1f8b865275bfd2db0b
2022-02-22 15:35:29 +08:00
xiaojianfeng 12460515d1 Revert "modify screenInfo, screengroupinfo, displayInfo, screen, screengroup, display"
This reverts commit 3a70997450.

Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: Idcbdea473ba24223477dbdd19ea20ecd0217501a
2022-02-21 18:27:27 +08:00
xiaojianfeng 3a70997450 modify screenInfo, screengroupinfo, displayInfo, screen, screengroup, display
Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: I16c23ce2bba78db54f35be08423c0d6675d1e643
2022-02-21 10:31:46 +08:00
lu b4c86170c8 update the size of the Display after rotate screen
Signed-off-by: lu <zhaolu2@huawei.com>
Change-Id: I918630d93678f4cdce904461e4a0f0efc846b2fd
2022-02-19 17:33:35 +08:00
openharmony_ci 795b2d3b82 !331 解决Expand场景下Display尺寸变化导致的死锁问题
Merge pull request !331 from youqijing/master
2022-02-18 10:15:33 +00:00
youqijing eb12955664 解决Expand场景下Display尺寸变化导致的死锁问题
Signed-off-by: youqijing <youqijing@huawei.com>
Change-Id: Iae2ae474a0c4ddb6083f62be470f81663e5b951a
2022-02-18 17:31:47 +08:00
lu 21b77cdd68 Fix deadlock when rotate a screen
Signed-off-by: lu <zhaolu2@huawei.com>
Change-Id: I3c2dc087c8bc593ac963797d7e3b967ce33a94a2
2022-02-18 15:10:20 +08:00
wangxinpeng ae8e51c695 update screen info to IMS
Signed-off-by: wangxinpeng <wangxinpeng4@huawei.com>
Change-Id: Id5dad11922237bba6a724bab7bad388746c12aec
2022-02-17 21:33:16 +08:00
lu 5c7827a609 clear DM warning
Signed-off-by: lu <zhaolu2@huawei.com>
Change-Id: I762ce417febfa918fee7665880db749cfd096286
2022-02-17 17:09:48 +08:00
openharmony_ci 0e068d8268 !298 修正开机概率黑屏问题
Merge pull request !298 from wangxinpeng/master
2022-02-16 12:04:26 +00:00
wangxinpeng 8196f66d0b check screen connection in display controller init
Signed-off-by: wangxinpeng <wangxinpeng4@huawei.com>
Change-Id: Ia480d042d4b2e90a013cab7ceb8772a9cd7d7579
2022-02-16 19:19:32 +08:00
chenqinxin 0da4dcf983 修复告警
Signed-off-by: chenqinxin <chenqinxin1@huawei.com>
Change-Id: I0f18d5d83e5dfbc2eba258daf41496b6263c357f
2022-02-16 19:04:59 +08:00
openharmony_ci 6dc494ab70 !282 根据屏幕旋转信息向IMS更新display信息
Merge pull request !282 from wangxinpeng/master
2022-02-15 10:44:22 +00:00
wangxinpeng 862cd8b6fa update screen rotation to IMS
Signed-off-by: wangxinpeng <wangxinpeng4@huawei.com>
Change-Id: I4146a1c2f3225ea168566767baa6568c2ba09ff7
2022-02-15 16:27:32 +08:00
youqijing 032c02e9cc Add screen expand code
Signed-off-by: youqijing <youqijing@huawei.com>
Change-Id: I79f0cf9cd50dfc09c0e12326784b62477f9b3a29
2022-02-15 16:20:22 +08:00
Grady f2f975474e add SetVirtualScreenSurface
Signed-off-by: Grady <yangguangwei4@huawei.com>
Change-Id: Idcb199852fda9de776e4bd1c234cdcc172a96a61
2022-02-14 20:45:43 +08:00
shiyueeee a05268ca08 Set display size as screen mode changes
Change-Id: I8c49155056aaa161c483941f4a857fcb2614db34
Signed-off-by: shiyueeee <nieshiyue@huawei.com>
2022-02-13 19:09:10 +08:00
fanby01 c9e5330811 support colorgamut for dms, adapter to render service.
Change-Id: I66ef16c675e78c7d690f702d62be4dd126f66368
Signed-off-by: fanby01 <yaojian7@huawei.com>
2022-02-13 15:49:36 +08:00
lu 6572da9a8a screen rotation
Signed-off-by: lu <zhaolu2@huawei.com>
Change-Id: I9af5c8e8ea99b1fc503c766fb76b2912c6a9fe46
2022-02-13 14:45:00 +08:00
xiaojianfeng aa4e5183f2 modify make mirror
Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: I2b7342bbb4197b488117bb2e48ffeeb1356d2d47
2022-02-13 09:20:33 +08:00
openharmony_ci e4568b0d44 !248 亮灭屏场景下调用AMS前后台切换接口并传入flag
Merge pull request !248 from 沁心/master
2022-02-12 02:20:37 +00:00
chenqinxin 2f6c9ea37a 亮灭屏场景下调用AMS前后台切换接口并传入flag
Signed-off-by: chenqinxin <chenqinxin1@huawei.com>
Change-Id: Id2f483168cbad29581165d17662b4a836f6e06aa
2022-02-11 15:43:39 +08:00
w00478450 ab88b7b769 migrate RSDisplayNode from WMS to DMS
Signed-off-by: w00478450 <wangqi175@huawei.com>
Change-Id: Ib0441f8fbb105e8a4ab96bcbde34cb50b118c19e
2022-02-10 23:07:21 +08:00
fanby01 b437cff8e6 support wide gamut for screen
Change-Id: Ib03dc47aa38b1d291a684df367ad3c810a334b8b
Signed-off-by: fanby01 <yaojian7@huawei.com>
2022-02-09 12:43:43 +08:00
Grady 56e10cb1ee Add get/set screen mode interface
Signed-off-by: Grady <yangguangwei4@huawei.com>
Change-Id: I1825f60f00cd1b89fdd72bc7246022ee32518e2d
2022-02-08 15:40:30 +08:00
openharmony_ci b8511f5640 !192 add screeninfo and displayinfo Listener callback and modify defaultscreen code
Merge pull request !192 from xiaojianfeng_huawei/local1
2022-02-07 06:28:40 +00:00
xiaojianfeng e843d9f5e4 add screeninfo and displayinfo Listener callback and modify defaultscreen code
Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: I9ec907966d0cbeb8292e555a18f6a21aaa4410ec
2022-02-07 09:48:09 +08:00
wangxinpeng 435193da76 complement Screen interface
Signed-off-by: wangxinpeng <wangxinpeng4@huawei.com>
Change-Id: Ice8fa6740ddf27ddfb06156480195ae1333442e8
2022-01-30 12:50:06 +08:00
xiaojianfeng 8d9c06d41e add ScreenChangeListener and DisplayChangeListener Binder Interface
Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: I44eb326765d0450bfe439595508fd97504326c08
2022-01-29 09:30:46 +08:00
openharmony_ci 225e9a294a !143 修改镜像屏的CPP层接口
Merge pull request !143 from 赵路/master
2022-01-27 10:39:18 +00:00
lu 0d6db8d45e Modify the interface of 'Screen'
Signed-off-by: lu <zhaolu2@huawei.com>
Change-Id: I4eb641ac1af413c3e420d59fbdd77a5823b7060a
2022-01-27 16:08:31 +08:00
xiaojianfeng 04cd4feb4e gadd screenInfo and screenGroupInfo
Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: I4fa1ae05fe455746dc293acb94598efb8b27e231
2022-01-27 11:55:43 +08:00
openharmony_ci 6ff8ea3934 !126 统一displayId为uint64_t
Merge pull request !126 from wangxinpeng/master
2022-01-26 07:52:05 +00:00
openharmony_ci 352d819531 !139 add future for timing task
Merge pull request !139 from xiaojianfeng_huawei/local1
2022-01-26 07:47:14 +00:00
xiaojianfeng fd69235220 add future in AbstractDisplayController
Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: Ife15eaf8916b5c2af4c2edc51cbece369d5393ae
2022-01-26 11:55:48 +08:00
wangxinpeng 4610cf06e3 fix int32_t displayId to uint64_t
Signed-off-by: wangxinpeng <wangxinpeng4@huawei.com>
Change-Id: I837bc7ec0af63c1bdad244e4b40609eae043889c
2022-01-26 11:24:24 +08:00
chenqinxin e117c55cbc wms向dms注册监听事件
Signed-off-by: chenqinxin <chenqinxin1@huawei.com>
Change-Id: I9d4465a9a0b55a5bbf982c80effd7a35c59c4db1
2022-01-26 10:07:06 +08:00
openharmony_ci 8d0b9cec6f !124 screen disconnect时,更新display信息
Merge pull request !124 from xiaojianfeng_huawei/local1
2022-01-22 06:20:42 +00:00
xiaojianfeng a71fea74d0 update displayinfo when screen disconnected
Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: I58be4fc99569bdc675b922fea9b9ef6d3a71b92b
2022-01-22 11:46:41 +08:00
chenqinxin 627a265c4e 修改mutex为recursive_mutex 防止同进程调用时无法获取到锁
Signed-off-by: chenqinxin <chenqinxin1@huawei.com>
Change-Id: I86aa44b78fbe1e1696d8d6bbb5c956475e7c7c0c
2022-01-20 15:52:43 +08:00
xiaojianfeng 8ced54a470 add code for screen
Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: I5a292caea692676369a866adfa50fdcc813471da
2022-01-19 17:13:28 +08:00