Merge remote-tracking branch 'origin/feature/cloud_app_connection_status' into feature/cloud_app_connection_status_disconnect

1 files changed, 10 insertions, 11 deletions

diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler.h b/src/components/application_manager/include/application_manager/policies/policy_handler.h
index a612c263ca..8ee5ff64f6 100644
--- a/src/components/application_manager/include/application_manager/policies/policy_handler.h
+++ b/src/components/application_manager/include/application_manager/policies/policy_handler.h
@@ -419,26 +419,25 @@ class PolicyHandler : public PolicyHandlerInterface,
    * @brief Get cloud app policy information, all fields that aren't set for a
    * given app will be filled with empty strings
    * @param policy_app_id Unique application id
+   * @param enabled Whether or not the app is enabled
    * @param endpoint Filled with the endpoint used to connect to the cloud
    * application
    * @param certificate Filled with the certificate used to for creating a
-   * secure
-   * connection to the cloud application
+   * secure connection to the cloud application
    * @param auth_token Filled with the token used for authentication when
    * reconnecting to the cloud app
    * @param cloud_transport_type Filled with the transport type used by the
    * cloud application (ex. "WSS")
-   * @param cloud_transport_type Filled with the hybrid app preference for the
+   * @param hybrid_app_preference Filled with the hybrid app preference for the
    * cloud application set by the user
-   * @return true if the cloud app is enabled, false otherwise
    */
-  const bool GetCloudAppParameters(
-      const std::string& policy_app_id,
-      std::string& endpoint,
-      std::string& certificate,
-      std::string& auth_token,
-      std::string& cloud_transport_type,
-      std::string& hybrid_app_preference) const OVERRIDE;
+  void GetCloudAppParameters(const std::string& policy_app_id,
+                             bool& enabled,
+                             std::string& endpoint,
+                             std::string& certificate,
+                             std::string& auth_token,
+                             std::string& cloud_transport_type,
+                             std::string& hybrid_app_preference) const OVERRIDE;
 
   /**
    * @brief Callback for when a SetCloudAppProperties message is received from a