review.tizen.org Git - profile/ivi/smartdevicelink.git/commit

projects / profile / ivi / smartdevicelink.git / commit

author	Polina Vyshnevska <PVyshnevska@luxoft.com>
	Sat, 29 Mar 2014 14:18:48 +0000 (16:18 +0200)
committer	Justin Dickow <jjdickow@gmail.com>
	Tue, 8 Jul 2014 22:23:35 +0000 (18:23 -0400)
commit	96da2e0ddd816435bdfca4982fc6112204cabf27
tree	4dfd01a9806fcb684afec4ace153d43110ee8a70	tree \| snapshot
parent	148f6e0c04c8448af0b26f30734faffc9c00d056	commit \| diff

APPLINK-6471: continuing merge policy and develop

Signed-off-by: Justin Dickow <jjdickow@gmail.com>
Conflicts:
src/components/application_manager/CMakeLists.txt
src/components/application_manager/src/application_manager_impl.cc
src/components/application_manager/src/hmi_command_factory.cc
src/components/application_manager/src/message_helper.cc
src/components/policies/CMakeLists.txt

97 files changed:

CMakeLists.txt		diff \| blob \| history
src/appMain/CMakeLists.txt		diff \| blob \| history
src/appMain/life_cycle.cc		diff \| blob \| history
src/appMain/life_cycle.h		diff \| blob \| history
src/appMain/sdl_preloaded_pt.json	[new file with mode: 0644]	blob
src/appMain/sdl_update_pt.json	[new file with mode: 0644]	blob
src/appMain/wp1_policy_table.json	[deleted file]	blob \| history
src/components/CMakeLists.txt		diff \| blob \| history
src/components/HMI/app/AppViews.js		diff \| blob \| history
src/components/HMI/app/StateManager.js		diff \| blob \| history
src/components/HMI/app/controller/sdl/Controller.js		diff \| blob \| history
src/components/HMI/app/controller/sdl/RPCController.js		diff \| blob \| history
src/components/HMI/app/model/sdl/AppModel.js		diff \| blob \| history
src/components/HMI/app/model/sdl/Model.js		diff \| blob \| history
src/components/HMI/app/model/sdl/VehicleInfoModel.js		diff \| blob \| history
src/components/HMI/app/view/home/bottomControls.js		diff \| blob \| history
src/components/HMI/app/view/home/controlButtons.js		diff \| blob \| history
src/components/HMI/app/view/sdl/VehicleInfoView.js		diff \| blob \| history
src/components/HMI/app/view/settings/policies/deviceConfigView.js	[new file with mode: 0644]	blob
src/components/HMI/app/view/settings/policies/statisticsInfoView.js	[new file with mode: 0644]	blob
src/components/HMI/app/view/settings/policiesView.js	[new file with mode: 0644]	blob
src/components/HMI/app/view/settingsView.js		diff \| blob \| history
src/components/HMI/css/buttonControls.css		diff \| blob \| history
src/components/HMI/css/sdl.css		diff \| blob \| history
src/components/HMI/css/settings.css	[new file with mode: 0644]	blob
src/components/HMI/ffw/BasicCommunicationRPC.js		diff \| blob \| history
src/components/HMI/images/settings/ico_settings.png	[new file with mode: 0644]	blob
src/components/HMI/index.html		diff \| blob \| history
src/components/application_manager/CMakeLists.txt		diff \| blob \| history
src/components/application_manager/include/application_manager/application_manager.h		diff \| blob \| history
src/components/application_manager/include/application_manager/application_manager_impl.h		diff \| blob \| history
src/components/application_manager/include/application_manager/commands/hmi/on_allow_sdl_functionality_notification.h	[new file with mode: 0644]	blob
src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_changed_notification.h	[new file with mode: 0644]	blob
src/components/application_manager/include/application_manager/commands/hmi/on_ignition_cycle_over_notification.h	[new file with mode: 0644]	blob
src/components/application_manager/include/application_manager/commands/hmi/on_sdl_consent_needed_notification.h	[new file with mode: 0644]	blob
src/components/application_manager/include/application_manager/commands/hmi/request_from_hmi.h	[new file with mode: 0644]	blob
src/components/application_manager/include/application_manager/commands/hmi/response_to_hmi.h	[moved from src/components/application_manager/include/application_manager/policies_manager/policies_manager.h with 66% similarity]	diff \| blob \| history
src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_request.h	[new file with mode: 0644]	blob
src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_response.h	[new file with mode: 0644]	blob
src/components/application_manager/include/application_manager/commands/hmi/update_sdl_request.h	[new file with mode: 0644]	blob
src/components/application_manager/include/application_manager/commands/hmi/update_sdl_response.h	[new file with mode: 0644]	blob
src/components/application_manager/include/application_manager/commands/mobile/register_app_interface_request.h		diff \| blob \| history
src/components/application_manager/include/application_manager/message_helper.h		diff \| blob \| history
src/components/application_manager/include/application_manager/policies/policy_event_observer.h	[new file with mode: 0644]	blob
src/components/application_manager/include/application_manager/policies/policy_handler.h	[new file with mode: 0644]	blob
src/components/application_manager/include/application_manager/policies/policy_retry_sequence.h	[new file with mode: 0644]	blob
src/components/application_manager/include/application_manager/policies/pt_exchange_handler.h	[new file with mode: 0644]	blob
src/components/application_manager/include/application_manager/policies/pt_exchange_handler_ext.h	[new file with mode: 0644]	blob
src/components/application_manager/include/application_manager/policies/pt_exchange_handler_impl.h	[new file with mode: 0644]	blob
src/components/application_manager/include/application_manager/smart_object_keys.h		diff \| blob \| history
src/components/application_manager/include/application_manager/vehicle_info_data.h	[new file with mode: 0644]	blob
src/components/application_manager/src/application_manager_impl.cc		diff \| blob \| history
src/components/application_manager/src/commands/hmi/on_allow_sdl_functionality_notification.cc	[new file with mode: 0644]	blob
src/components/application_manager/src/commands/hmi/on_app_permission_changed_notification.cc	[new file with mode: 0644]	blob
src/components/application_manager/src/commands/hmi/on_exit_all_applications_notification.cc		diff \| blob \| history
src/components/application_manager/src/commands/hmi/on_ignition_cycle_over_notification.cc	[new file with mode: 0644]	blob
src/components/application_manager/src/commands/hmi/on_sdl_consent_needed_notification.cc	[new file with mode: 0644]	blob
src/components/application_manager/src/commands/hmi/request_from_hmi.cc	[new file with mode: 0644]	blob
src/components/application_manager/src/commands/hmi/response_to_hmi.cc	[new file with mode: 0644]	blob
src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc	[new file with mode: 0644]	blob
src/components/application_manager/src/commands/hmi/sdl_activate_app_response.cc	[new file with mode: 0644]	blob
src/components/application_manager/src/commands/hmi/update_sdl_request.cc	[new file with mode: 0644]	blob
src/components/application_manager/src/commands/hmi/update_sdl_response.cc	[new file with mode: 0644]	blob
src/components/application_manager/src/commands/mobile/on_vehicle_data_notification.cc		diff \| blob \| history
src/components/application_manager/src/commands/mobile/put_file_request.cc		diff \| blob \| history
src/components/application_manager/src/commands/mobile/register_app_interface_request.cc		diff \| blob \| history
src/components/application_manager/src/hmi_command_factory.cc		diff \| blob \| history
src/components/application_manager/src/message_helper.cc		diff \| blob \| history
src/components/application_manager/src/policies/policy_event_observer.cc	[new file with mode: 0644]	blob
src/components/application_manager/src/policies/policy_handler.cc	[new file with mode: 0644]	blob
src/components/application_manager/src/policies/policy_retry_sequence.cc	[new file with mode: 0644]	blob
src/components/application_manager/src/policies/pt_exchange_handler.cc	[new file with mode: 0644]	blob
src/components/application_manager/src/policies/pt_exchange_handler_ext.cc	[new file with mode: 0644]	blob
src/components/application_manager/src/policies/pt_exchange_handler_impl.cc	[new file with mode: 0644]	blob
src/components/application_manager/src/policies_manager/policies_manager.cc	[deleted file]	blob \| history
src/components/config_profile/include/config_profile/profile.h		diff \| blob \| history
src/components/config_profile/src/profile.cc		diff \| blob \| history
src/components/hmi_message_handler/src/messagebroker_adapter.cc		diff \| blob \| history
src/components/interfaces/HMI_API.xml		diff \| blob \| history
src/components/media_manager/CMakeLists.txt		diff \| blob \| history
src/components/policies/CMakeLists.txt	[deleted file]	blob \| history
src/components/policies/include/policies/permissions_calculator.h	[deleted file]	blob \| history
src/components/policies/include/policies/policy_configuration.h	[deleted file]	blob \| history
src/components/policies/include/policies/policy_manager.h	[deleted file]	blob \| history
src/components/policies/include/policies/policy_manager_impl.h	[deleted file]	blob \| history
src/components/policies/include/policies/policy_table.h	[deleted file]	blob \| history
src/components/policies/include/policies/policy_table_schema.h	[deleted file]	blob \| history
src/components/policies/include/policies/preloaded_pt_schema.h	[deleted file]	blob \| history
src/components/policies/src/permissions_calculator.cc	[deleted file]	blob \| history
src/components/policies/src/policy_configuration.cc	[deleted file]	blob \| history
src/components/policies/src/policy_manager_impl.cc	[deleted file]	blob \| history
src/components/policies/src/policy_table.cc	[deleted file]	blob \| history
src/components/policies/src/policy_table_schema.cc	[deleted file]	blob \| history
src/components/policies/src/preloaded_pt_schema.cc	[deleted file]	blob \| history
src/components/policy		diff \| blob \| history
src/components/rpc_base/CMakeLists.txt	[new file with mode: 0644]	blob
src/components/rpc_base/src/rpc_base/rpc_base.cc	[new file with mode: 0644]	blob

Domain: System / Uncategorized;

RSS Atom