Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cherry-pick two changes from v25 dev #571

Merged
merged 2 commits into from
Nov 21, 2024
Merged

Conversation

re2zero
Copy link
Contributor

@re2zero re2zero commented Nov 20, 2024

cherry-pick two changes from v25 dev

1. Always show link button for cooperation. 2. Make the peripheral share controlable by setting.
3. Update device state into discovery after disconnected.

Log: Make the peripheral share controlable by setting.
Bug: https://pms.uniontech.com/bug-view-275617.html
Terminate all barrier process before start one in roder to make sure only one client or server is working.

Log: Terminate all process before start one。
@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: max-lvs, pppanghu77, re2zero

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@re2zero
Copy link
Contributor Author

re2zero commented Nov 21, 2024

/merge

@deepin-bot deepin-bot bot merged commit c0ec409 into linuxdeepin:master Nov 21, 2024
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants