diff options
author | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-04-11 16:22:09 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-11 16:22:09 -0400 |
commit | a96ca2301e9d8380ec7e7ace098f690ff85ed75b (patch) | |
tree | fb13d885539946dcada21e4ad9cdc6429aac6f9f /src/components/application_manager | |
parent | 9daadfd199efd06709488aa69b06f7a594bb3ea0 (diff) | |
parent | e15e3537c9fa898b6e6142ff01e75d23391f959a (diff) | |
download | sdl_core-a96ca2301e9d8380ec7e7ace098f690ff85ed75b.tar.gz |
Merge pull request #2114 from smartdevicelink/hotfix/invalid_ptu_loop
Don't force a PTU when an invalid PT is received
Diffstat (limited to 'src/components/application_manager')
-rw-r--r-- | src/components/application_manager/src/policies/policy_handler.cc | 3 | ||||
-rw-r--r-- | src/components/application_manager/test/policy_handler_test.cc | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc index bbf391a9f1..559b9c0035 100644 --- a/src/components/application_manager/src/policies/policy_handler.cc +++ b/src/components/application_manager/src/policies/policy_handler.cc @@ -1091,8 +1091,7 @@ bool PolicyHandler::ReceiveMessageFromSDK(const std::string& file, MessageHelper::CreateGetVehicleDataRequest( correlation_id, vehicle_data_args, application_manager_); } else { - LOG4CXX_WARN(logger_, "Exchange wasn't successful, trying another one."); - policy_manager_->ForcePTExchange(); + LOG4CXX_WARN(logger_, "Exchange wasn't successful"); } OnPTUFinished(ret); return ret; diff --git a/src/components/application_manager/test/policy_handler_test.cc b/src/components/application_manager/test/policy_handler_test.cc index 77500fd238..d9e1cefa01 100644 --- a/src/components/application_manager/test/policy_handler_test.cc +++ b/src/components/application_manager/test/policy_handler_test.cc @@ -408,7 +408,6 @@ TEST_F(PolicyHandlerTest, ReceiveMessageFromSDK_PTNotLoaded) { // Checks EXPECT_CALL(*mock_policy_manager_, LoadPT("", msg)).WillOnce(Return(false)); - EXPECT_CALL(*mock_policy_manager_, ForcePTExchange()).WillOnce(Return("")); EXPECT_CALL(app_manager_, GetNextHMICorrelationID()).Times(0); EXPECT_CALL(mock_message_helper_, CreateGetVehicleDataRequest(_, _, _)) .Times(0); |