Merge pull request #2373 from smartdevicelink/fix/rc_disabling

SDL shall not put RC applications to HMI level NONE when user disables RC in HMI

2 files changed, 1 insertions, 23 deletions

diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_remote_control_settings_notification.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_remote_control_settings_notification.cc
index b67e3e2553..91cb6cb7ee 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_remote_control_settings_notification.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_remote_control_settings_notification.cc
@@ -89,14 +89,6 @@ std::string AccessModeToString(
 
 void RCOnRemoteControlSettingsNotification::DisallowRCFunctionality() {
   LOG4CXX_AUTO_TRACE(logger_);
-  typedef std::vector<application_manager::ApplicationSharedPtr> Apps;
-  Apps apps = RCRPCPlugin::GetRCApplications(application_manager_);
-  for (Apps::iterator it = apps.begin(); it != apps.end(); ++it) {
-    application_manager::ApplicationSharedPtr app = *it;
-    DCHECK(app);
-    application_manager_.ChangeAppsHMILevel(
-        app->app_id(), mobile_apis::HMILevel::eType::HMI_NONE);
-  }
   interior_data_manager_.OnDisablingRC();
 }
 
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_remote_control_settings_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_remote_control_settings_test.cc
index 164623d926..b95725e0b4 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_remote_control_settings_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_remote_control_settings_test.cc
@@ -139,22 +139,8 @@ TEST_F(RCOnRemoteControlSettingsNotificationTest,
   (*mobile_message)[application_manager::strings::msg_params]
                    [message_params::kAllowed] = false;
 
-  ApplicationSet app_set = {mock_app_};
-
-  std::shared_ptr<sync_primitives::Lock> apps_lock =
-      std::make_shared<sync_primitives::Lock>();
-  DataAccessor<ApplicationSet> accessor(app_set, apps_lock);
-  // Expectations
-  EXPECT_CALL(app_mngr_, applications()).WillOnce(Return(accessor));
-
-  RCAppExtensionPtr rc_extention_ptr =
-      std::make_shared<RCAppExtension>(application_manager::AppExtensionUID(
-          rc_rpc_plugin::RCRPCPlugin::kRCPluginID));
-  rc_extention_ptr->SubscribeToInteriorVehicleData(enums_value::kClimate);
-  ON_CALL(*mock_app_, QueryInterface(_))
-      .WillByDefault(Return(rc_extention_ptr));
-
   EXPECT_CALL(mock_allocation_manager_, ResetAllAllocations());
+  EXPECT_CALL(mock_interior_data_manager_, OnDisablingRC());
 
   // Act
   std::shared_ptr<