merge from tizen_2.4 14/51614/5 accepted/tizen/mobile/20151117.050504 accepted/tizen/tv/20151117.050529 accepted/tizen/wearable/20151117.050549 submit/tizen/20151117.021955
authorKyeonghun Lee <kh9090.lee@samsung.com>
Wed, 11 Nov 2015 07:42:43 +0000 (16:42 +0900)
committerKyeonghun Lee <kh9090.lee@samsung.com>
Thu, 12 Nov 2015 02:37:55 +0000 (11:37 +0900)
commit79fd21d5513806a3512d7af99aef6f8ac3dd6c81
tree7f1875c957c04b7e815f4cc9e72f83922334a3a0
parentbb78967d7807f0958c2aa72d82d87f79ede3dba0
merge from tizen_2.4

Change-Id: I23964dbb9b5e1991cbe484d618537ccdd04957b1
Signed-off-by: Kyeonghun Lee <kh9090.lee@samsung.com>
178 files changed:
externals/CMakeLists.txt
externals/MsgAlarm.cpp
externals/MsgDevicedWrapper.cpp
externals/MsgNotificationWrapper.cpp
externals/MsgSensorWrapper.cpp
externals/MsgSoundPlayer.cpp
externals/MsgSpamFilter.cpp
framework/CMakeLists.txt
framework/deliver-handler/MsgDeliverHandler.cpp
framework/main.cpp
framework/plugin-manager/MsgPluginManager.cpp
framework/setting-handler/MsgSettingHandler.cpp
framework/storage-handler/MsgStorageManager.cpp
framework/storage-handler/MsgStorageMessage.cpp
framework/storage-handler/MsgStorageMms.cpp
framework/storage-handler/MsgStorageUtil.cpp
framework/submit-handler/MsgSubmitHandler.cpp
framework/transaction-manager/MsgCmdHandlerFilter.cpp
framework/transaction-manager/MsgCmdHandlerStorage.cpp
framework/transaction-manager/MsgCmdHandlerTransport.cpp
framework/transaction-manager/MsgTransManager.cpp
include/common/MsgCmdTypes.h
include/common/MsgInternalTypes.h
include/common/MsgPluginInterface.h
include/common/MsgTypes.h
include/externals/MsgAlarm.h
include/externals/MsgNotificationWrapper.h
include/externals/MsgSensorWrapper.h
include/externals/MsgSoundPlayer.h
include/externals/MsgSpamFilter.h
include/framework/MsgCmdHandler.h
include/framework/MsgDeliverHandler.h
include/framework/MsgStorageHandler.h
include/framework/MsgTransManager.h
include/mapi/msg_private.h
include/mapi/msg_storage_types.h
include/mapi/msg_types.h
include/proxy/MsgHandle.h
include/proxy/MsgProxyListener.h
include/utils/MsgCallStatusManager.h [new file with mode: 0644]
include/utils/MsgDebug.h
include/utils/MsgJsonParser.h
include/utils/MsgSqliteWrapper.h
include/utils/MsgTextConvert.h
include/utils/MsgUtilFile.h
include/utils/MsgUtilFunction.h
include/utils/MsgUtilMime.h [moved from plugin/mms_plugin/include/MmsPluginMIME.h with 81% similarity]
include/utils/MsgUtilStorage.h
include/utils/MsgVMessage.h
mapi/msg_control.cpp
mapi/msg_filter.cpp
mapi/msg_message.cpp
mapi/msg_mms.cpp
mapi/msg_setting.cpp
mapi/msg_storage.cpp
mapi/msg_svc.cpp
mapi/msg_transport.cpp
packaging/msg-service.spec
plugin/mms_plugin/CMakeLists.txt
plugin/mms_plugin/MmsPluginAppBase.cpp
plugin/mms_plugin/MmsPluginCodecCommon.cpp
plugin/mms_plugin/MmsPluginComposer.cpp
plugin/mms_plugin/MmsPluginConnManWrapper.cpp
plugin/mms_plugin/MmsPluginDecode.cpp
plugin/mms_plugin/MmsPluginDrm.cpp
plugin/mms_plugin/MmsPluginEncode.cpp
plugin/mms_plugin/MmsPluginEventHandler.cpp
plugin/mms_plugin/MmsPluginHttp.cpp
plugin/mms_plugin/MmsPluginInternal.cpp
plugin/mms_plugin/MmsPluginMain.cpp
plugin/mms_plugin/MmsPluginMessage.cpp
plugin/mms_plugin/MmsPluginSMILValidate.cpp
plugin/mms_plugin/MmsPluginStorage.cpp
plugin/mms_plugin/MmsPluginTcs.cpp [deleted file]
plugin/mms_plugin/MmsPluginTextConvert.cpp
plugin/mms_plugin/MmsPluginTransport.cpp
plugin/mms_plugin/MmsPluginUserAgent.cpp
plugin/mms_plugin/MmsPluginUtil.cpp
plugin/mms_plugin/include/MmsPluginAppBase.h
plugin/mms_plugin/include/MmsPluginCodec.h
plugin/mms_plugin/include/MmsPluginCodecCommon.h
plugin/mms_plugin/include/MmsPluginCodecTypes.h
plugin/mms_plugin/include/MmsPluginComposer.h
plugin/mms_plugin/include/MmsPluginConnManWrapper.h
plugin/mms_plugin/include/MmsPluginDebug.h
plugin/mms_plugin/include/MmsPluginDecode.h
plugin/mms_plugin/include/MmsPluginDrm.h
plugin/mms_plugin/include/MmsPluginEncode.h
plugin/mms_plugin/include/MmsPluginEventHandler.h
plugin/mms_plugin/include/MmsPluginHttp.h
plugin/mms_plugin/include/MmsPluginInternal.h
plugin/mms_plugin/include/MmsPluginMain.h
plugin/mms_plugin/include/MmsPluginMessage.h
plugin/mms_plugin/include/MmsPluginStorage.h
plugin/mms_plugin/include/MmsPluginTcs.h [deleted file]
plugin/mms_plugin/include/MmsPluginTextConvert.h
plugin/mms_plugin/include/MmsPluginTransport.h
plugin/mms_plugin/include/MmsPluginTypes.h
plugin/mms_plugin/include/MmsPluginUserAgent.h
plugin/mms_plugin/include/MmsPluginUtil.h
plugin/sms_cdma_plugin/CMakeLists.txt
plugin/sms_cdma_plugin/SmsCdmaPluginCallback.cpp
plugin/sms_cdma_plugin/SmsCdmaPluginCodec.cpp
plugin/sms_cdma_plugin/SmsCdmaPluginEventHandler.cpp
plugin/sms_cdma_plugin/SmsCdmaPluginMain.cpp
plugin/sms_cdma_plugin/SmsCdmaPluginParamCodec.cpp
plugin/sms_cdma_plugin/SmsCdmaPluginSetting.cpp
plugin/sms_cdma_plugin/SmsCdmaPluginStorage.cpp
plugin/sms_cdma_plugin/SmsCdmaPluginTransport.cpp
plugin/sms_cdma_plugin/SmsCdmaPluginUAManager.cpp
plugin/sms_cdma_plugin/SmsCdmaPluginWapPushHandler.cpp
plugin/sms_cdma_plugin/include/SmsCdmaPluginCallback.h
plugin/sms_cdma_plugin/include/SmsCdmaPluginCodec.h
plugin/sms_cdma_plugin/include/SmsCdmaPluginEventHandler.h
plugin/sms_cdma_plugin/include/SmsCdmaPluginMain.h
plugin/sms_cdma_plugin/include/SmsCdmaPluginSetting.h
plugin/sms_cdma_plugin/include/SmsCdmaPluginStorage.h
plugin/sms_cdma_plugin/include/SmsCdmaPluginTransport.h
plugin/sms_cdma_plugin/include/SmsCdmaPluginTypes.h
plugin/sms_cdma_plugin/include/SmsCdmaPluginUAManager.h
plugin/sms_cdma_plugin/include/SmsCdmaPluginWapPushHandler.h
plugin/sms_plugin/CMakeLists.txt
plugin/sms_plugin/SmsPluginCallback.cpp
plugin/sms_plugin/SmsPluginCbMsgHandler.cpp
plugin/sms_plugin/SmsPluginConcatHandler.cpp
plugin/sms_plugin/SmsPluginDSHandler.cpp
plugin/sms_plugin/SmsPluginEventHandler.cpp
plugin/sms_plugin/SmsPluginMain.cpp
plugin/sms_plugin/SmsPluginParamCodec.cpp
plugin/sms_plugin/SmsPluginSatHandler.cpp
plugin/sms_plugin/SmsPluginSetting.cpp
plugin/sms_plugin/SmsPluginSimMsg.cpp
plugin/sms_plugin/SmsPluginStorage.cpp
plugin/sms_plugin/SmsPluginTpduCodec.cpp
plugin/sms_plugin/SmsPluginTransport.cpp
plugin/sms_plugin/SmsPluginUAManager.cpp
plugin/sms_plugin/SmsPluginUDCodec.cpp
plugin/sms_plugin/SmsPluginWapPushHandler.cpp
plugin/sms_plugin/include/SmsPluginCallback.h
plugin/sms_plugin/include/SmsPluginCbMsgHandler.h
plugin/sms_plugin/include/SmsPluginConcatHandler.h
plugin/sms_plugin/include/SmsPluginDSHandler.h
plugin/sms_plugin/include/SmsPluginEventHandler.h
plugin/sms_plugin/include/SmsPluginMain.h
plugin/sms_plugin/include/SmsPluginParamCodec.h
plugin/sms_plugin/include/SmsPluginSatHandler.h
plugin/sms_plugin/include/SmsPluginSetting.h
plugin/sms_plugin/include/SmsPluginSimMsg.h
plugin/sms_plugin/include/SmsPluginStorage.h
plugin/sms_plugin/include/SmsPluginTpduCodec.h
plugin/sms_plugin/include/SmsPluginTransport.h
plugin/sms_plugin/include/SmsPluginTypes.h
plugin/sms_plugin/include/SmsPluginUAManager.h
plugin/sms_plugin/include/SmsPluginUDCodec.h
plugin/sms_plugin/include/SmsPluginWapPushHandler.h
proxy/CMakeLists.txt
proxy/MsgHandleControl.cpp
proxy/MsgHandleFilter.cpp
proxy/MsgHandleSetting.cpp
proxy/MsgHandleStorage.cpp
proxy/MsgHandleTransport.cpp
proxy/MsgProxyListener.cpp
utils/CMakeLists.txt
utils/MsgCallStatusManager.cpp [new file with mode: 0644]
utils/MsgContact.cpp
utils/MsgDebug.cpp
utils/MsgIpcSocket.cpp
utils/MsgJsonParser.cpp
utils/MsgMmsMessage.cpp
utils/MsgSerialize.cpp
utils/MsgSmil.cpp
utils/MsgSqliteWrapper.cpp
utils/MsgTextConvert.cpp
utils/MsgUtilFile.cpp
utils/MsgUtilFunction.cpp
utils/MsgUtilMime.cpp [moved from plugin/mms_plugin/MmsPluginMIME.cpp with 93% similarity]
utils/MsgUtilStorage.cpp
utils/MsgVMessage.cpp