Fix/wrong order of requests on device disconnect #2517
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
KVGrygoriev
requested review from
AKalinich-Luxoft,
LuxoftAKutsan,
AByzhynar,
APipko,
EKuliiev,
Itileda,
LitvinenkoIra,
a user,
SNiukalov and
ZhdanovP
EKuliiev
approved these changes
Aug 16, 2018
EKuliiev
reviewed
Aug 16, 2018
| @@ -1440,6 +1440,14 @@ class ApplicationManagerImpl | |||
| static std::vector<std::string> ConvertRejectedParamList( | |||
| const std::vector<std::string>& input); | |||
|
|
|||
| /** | |||
There was a problem hiding this comment.
@KVGrygoriev missed arg names in description
@param app_to_remove the application which should be removed
@param is_unexpected_disconnect specifies whether the disconnect was unexpected
There was a problem hiding this comment.
@EKuliiev thanks, fixed
KVGrygoriev
force-pushed
the
fix/wrong_order_of_requests_on_device_disconnect
branch
from
3753dbf to
0899fa0
Compare
AKalinich-Luxoft
suggested changes
Aug 20, 2018
| @@ -2623,12 +2630,15 @@ void ApplicationManagerImpl::UnregisterApplication( | |||
| logger_, "There is no more SDL4 apps with device handle: " << handle); | |||
|
|
|||
| RemoveAppsWaitingForRegistration(handle); | |||
| ClearCommandListAndSendOnAppUnregNotificationToHMI( | |||
There was a problem hiding this comment.
@KVGrygoriev I really dont like functions with more than one responsibility.
I suggest you to update this code like:
if (!app) {
LOG4CXX_DEBUG(
logger_, "There is no more SDL4 apps with device handle: " << handle);
RemoveAppsWaitingForRegistration(handle);
}
commands_holder_->Clear(app_to_remove);
MessageHelper::SendOnAppUnregNotificationToHMI(app_to_remove, is_unexpected_disconnect, *this);
if (!app) {
SendUpdateAppList();
}
Or even like this if SendUpdateAppList call order is not necessary for this case:
if (!app) {
LOG4CXX_DEBUG(
logger_, "There is no more SDL4 apps with device handle: " << handle);
RemoveAppsWaitingForRegistration(handle);
SendUpdateAppList();
}
commands_holder_->Clear(app_to_remove);
MessageHelper::SendOnAppUnregNotificationToHMI(app_to_remove, is_unexpected_disconnect, *this);
14f3b8c to
34440c0
Compare
|
@AKalinich-Luxoft fixed |
AKalinich-Luxoft
approved these changes
Aug 20, 2018
KVGrygoriev
force-pushed
the
fix/wrong_order_of_requests_on_device_disconnect
branch
from
34440c0 to
b5dccbb
Compare
KVGrygoriev
force-pushed
the
fix/wrong_order_of_requests_on_device_disconnect
branch
from
b5dccbb to
5b95373
Compare
| @@ -1949,7 +1949,7 @@ bool ApplicationManagerImpl::Stop() { | |||
| application_list_update_timer_.Stop(); | |||
| try { | |||
| SetUnregisterAllApplicationsReason( | |||
| mobile_api::AppInterfaceUnregisteredReason::IGNITION_OFF); | |||
| mobile_api::AppInterfaceUnregisteredReason::IGNITION_OFF); | |||
There was a problem hiding this comment.
@KVGrygoriev make this change as additional commit
There was a problem hiding this comment.
@LuxoftAKutsan this changes will disappear when someone fix it in develop branch
There was a problem hiding this comment.
@KVGrygoriev commit will still contain this changes and cherry pick may trigger conflicts
LuxoftAKutsan
approved these changes
Aug 21, 2018
ZhdanovP
approved these changes
Aug 21, 2018
AByzhynar
approved these changes
Sep 2, 2018
SNiukalov
approved these changes
Sep 7, 2018
LitvinenkoIra
approved these changes
Dec 12, 2018
…_requests_on_device_disconnect
iCollin
approved these changes
May 19, 2020
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.
Fixes #2238
This PR is ready for review.
Risk
This PR makes no API changes.
Summary
Moves clearing command list and SendOnAppUnreg notification call into separate logic unit.
Fixes SDL behaviour when device is suddenly disconnected.
CLA