Merge branch 'tizen_3.0' into tizentizen_3.0.m1_tv_releasetizen_3.0.m1_mobile_releasesubmit/tizen_common/20151026.085049submit/tizen_common/20151023.083358submit/tizen/20150909.024403accepted/tizen/wearable/20150909.055258accepted/tizen/tv/20150909.055247accepted/tizen/mobile/20150909.055223tizen_3.0.m1_tvtizen_3.0.m1_mobile

1 files changed, 13 insertions, 5 deletions

diff --git a/src/messaging/messaging_instance.cc b/src/messaging/messaging_instance.cc
index 33d880f8..99f3d03c 100755
--- a/src/messaging/messaging_instance.cc
+++ b/src/messaging/messaging_instance.cc
@@ -18,6 +18,7 @@
 
 #include <sstream>
 #include <stdexcept>
+#include <system_info.h>
 
 #include "common/logger.h"
 
@@ -221,11 +222,18 @@ void MessagingInstance::MessageServiceSendMessage(const picojson::value& args,
     simIndex = static_cast<long>
       (MessagingUtil::getValueFromJSONObject<double>(data,SEND_MESSAGE_ARGS_SIMINDEX));
 
-    if (!callback->setSimIndex(simIndex)) {
-      delete callback;
-      callback = nullptr;
-      POST_AND_RETURN(PlatformResult(ErrorCode::UNKNOWN_ERR, "set sim index failed"),
-                      json, obj, JSON_CALLBACK_ERROR)
+    bool cell_support = false;
+    system_info_get_platform_bool("http://tizen.org/feature/network.telephony", &cell_support);
+    if (cell_support) {
+      LoggerD("cell_support is true");
+      if (!callback->setSimIndex(simIndex)) {
+        delete callback;
+        callback = nullptr;
+        POST_AND_RETURN(PlatformResult(ErrorCode::UNKNOWN_ERR, "set sim index failed"),
+                        json, obj, JSON_CALLBACK_ERROR)
+      }
+    } else {
+      LoggerD("cell_support is false");
     }
 
     queue_.add(static_cast<long>(callbackId), PostPriority::HIGH);