fix: app blocked when AM is unavailable #396
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18202781743
requested review from
zccrs and
kegechen
and removed request for
zccrs
deepin-ci-robot
added a commit
to linuxdeepin/dtk6core
that referenced
this pull request
Dec 8, 2023
Synchronize source files from linuxdeepin/dtkcore. Source-pull-request: linuxdeepin/dtkcore#396
18202781743
force-pushed
the
appid-blocked-by-am
branch
from
f288062 to
74b86db
Compare
deepin-ci-robot
added a commit
to linuxdeepin/dtk6core
that referenced
this pull request
Dec 8, 2023
Synchronize source files from linuxdeepin/dtkcore. Source-pull-request: linuxdeepin/dtkcore#396
18202781743
force-pushed
the
appid-blocked-by-am
branch
from
74b86db to
2f6628c
Compare
deepin-ci-robot
added a commit
to linuxdeepin/dtk6core
that referenced
this pull request
Dec 8, 2023
Synchronize source files from linuxdeepin/dtkcore. Source-pull-request: linuxdeepin/dtkcore#396
zccrs
requested changes
Dec 8, 2023
We don't block application when AM is unavailable.
18202781743
force-pushed
the
appid-blocked-by-am
branch
from
2f6628c to
876187a
Compare
deepin-ci-robot
added a commit
to linuxdeepin/dtk6core
that referenced
this pull request
Dec 8, 2023
Synchronize source files from linuxdeepin/dtkcore. Source-pull-request: linuxdeepin/dtkcore#396
zccrs
approved these changes
Dec 8, 2023
| @@ -52,6 +66,11 @@ QByteArray DSGApplication::id() | |||
|
|
|||
| QByteArray DSGApplication::getId(qint64 pid) | |||
| { | |||
| if (!isServiceActivatable("org.desktopspec.ApplicationManager1")) { | |||
| qCInfo(dsgApp) << "Can't getId from AM for the " << pid << ", because AM is unavailable."; | |||
| return QByteArray(); | |||
There was a problem hiding this comment.
虽然挪到前面可以避免这个提交引入问题，不过要加一个新提交修复一下，再下面的流程中，pidfd还是需要关闭的吧。
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: 18202781743, zccrs 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 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We don't block application when AM is unavailable.