fix error on receiving mms while dpm disallowed

Change-Id: I8def211b743851d0003b9c7ec35fe71e3ffea715
Signed-off-by: Kyeonghun Lee <kh9090.lee@samsung.com>
(cherry picked from commit e5fd53692a4ae0115cb2feb2d4585b032caa8edd)

diff --git a/framework/deliver-handler/MsgDeliverHandler.cpp b/framework/deliver-handler/MsgDeliverHandler.cpp
index 0674164fce1c7891d4fa24a37d0f178e92db2b69..b2e79e0fe3e08e282114f52de4625533d90de822 100755 (executable)
--- a/framework/deliver-handler/MsgDeliverHandler.cpp
+++ b/framework/deliver-handler/MsgDeliverHandler.cpp
@@ -596,7 +596,6 @@ msg_error_t MsgHandleMMS(MSG_MESSAGE_INFO_S *pMsgInfo,  bool *pSendNoti)
                if (msg_check_dpm_policy(pMsgInfo->msgType.mainType) == false) {
                        MSG_DEBUG("Messaging is restricted by DPM policy.");
                        pMsgInfo->bRestricted = true;
-                       *pSendNoti = false;
                }
 
                err = MsgStoAddMessage(pMsgInfo, NULL);

diff --git a/plugin/mms_plugin/MmsPluginMain.cpp b/plugin/mms_plugin/MmsPluginMain.cpp
index 25f5d599654aa30a1f2c9ad4aa1209b9985772c7..9f1a33ccfa1fd92b0f2a90fa91add4034c88ba33 100755 (executable)
--- a/plugin/mms_plugin/MmsPluginMain.cpp
+++ b/plugin/mms_plugin/MmsPluginMain.cpp
@@ -114,7 +114,7 @@ msg_error_t MmsSubmitRequest(MSG_REQUEST_INFO_S *pReqInfo)
        MSG_BEGIN();
 
        try {
-               if (msg_check_dpm_policy(pReqInfo->msgInfo.msgType.mainType) == false) {
+               if (pReqInfo->msgInfo.msgType.subType != MSG_GET_MMS && msg_check_dpm_policy(pReqInfo->msgInfo.msgType.mainType) == false) {
                        MSG_DEBUG("Messaging is restricted by DPM policy.");
                        return MSG_ERR_DPM_RESTRICT;
                }