From: Piotr Kosko <p.kosko@samsung.com>
Date: Fri, 23 Mar 2018 11:12:17 +0000 (+0100)
Subject: Merge branch 'tizen_3.0' into tizen_4.0
X-Git-Tag: submit/tizen_4.0/20180323.180729~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F36%2F173736%2F1;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

Merge branch 'tizen_3.0' into tizen_4.0

Change-Id: I08833f4e4e820cafcdf5cbb6a291f4c7d78bf05d
---

d21992e10810a45de4b6308d4778a4c5a9068b3e
diff --cc src/nfc/nfc_adapter.cc
index 41691a78,3a6f9ebf..f1725f3a
--- a/src/nfc/nfc_adapter.cc
+++ b/src/nfc/nfc_adapter.cc
@@@ -1392,13 -1381,11 +1392,13 @@@ void NFCAdapter::SendHostAPDUResponse(c
  PlatformResult NFCAdapter::IsActivatedHandlerForAID(const std::string& type, const std::string& aid,
                                                      bool* is_activated_handler) {
    ScopeLogger();
 -  AssertMsg(is_activated_handler, "Poiner can not be null!");
  
 +  if (!is_activated_handler) {
 +    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Pointer can not be null!");
 +  }
    nfc_se_type_e se_type;
    PlatformResult result = NFCUtil::ToSecureElementType(type, &se_type);
-   if (!result.IsError()) {
+   if (result.IsError()) {
      LoggerE("Error: %s", result.message().c_str());
      return result;
    }
@@@ -1415,13 -1402,11 +1415,13 @@@ PlatformResult NFCAdapter::IsActivatedH
      const std::string& type, nfc_card_emulation_category_type_e category,
      bool* is_activated_handler) {
    ScopeLogger();
 -  AssertMsg(is_activated_handler, "Poiner can not be null!");
  
 +  if (!is_activated_handler) {
 +    return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Pointer can not be null!");
 +  }
    nfc_se_type_e se_type;
    PlatformResult result = NFCUtil::ToSecureElementType(type, &se_type);
-   if (!result.IsError()) {
+   if (result.IsError()) {
      LoggerE("Error: %s", result.message().c_str());
      return result;
    }
diff --cc src/systeminfo/systeminfo_manager.cc
index d4110918,f7afef0b..7c301fee
--- a/src/systeminfo/systeminfo_manager.cc
+++ b/src/systeminfo/systeminfo_manager.cc
@@@ -1006,13 -986,10 +995,11 @@@ PlatformResult SysteminfoManager::Regis
  
  PlatformResult SysteminfoManager::UnregisterStorageListener() {
    ScopeLogger();
 -  PlatformResult ret = PlatformResult(ErrorCode::NO_ERROR);
 -
    g_source_remove(storage_event_id_);
    storage_event_id_ = 0;
 +
 +  PlatformResult ret = PlatformResult(ErrorCode::NO_ERROR);
-   CHECK_LISTENER_ERROR(
-       SysteminfoUtils::UnregisterVconfCallback(VCONFKEY_SYSMAN_MMC_STATUS, OnMmcChangedCb))
 +
    LoggerD("Removed callback for STORAGE");
    return PlatformResult(ErrorCode::NO_ERROR);
  }