From: Piotr Kosko <p.kosko@samsung.com>
Date: Tue, 16 Jan 2018 09:48:26 +0000 (+0100)
Subject: Merge branch 'tizen_3.0' into tizen_4.0
X-Git-Tag: submit/tizen_4.0/20180116.110851^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=50e272196a883f11b1419dae405eb4db8bde5537;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

Merge branch 'tizen_3.0' into tizen_4.0

Conflicts:
	src/filesystem/filesystem_instance.cc
	src/filesystem/js/file.js

Change-Id: I355ce9bb6d27d1990267994f0cfec5c7eaa07792
---

50e272196a883f11b1419dae405eb4db8bde5537
diff --cc packaging/webapi-plugins.spec
index 77d8911d,4cc09217..4965cba6
--- a/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@@ -8,7 -10,7 +8,7 @@@
  %define crosswalk_extensions_path %{_libdir}/%{crosswalk_extensions}
  
  Name:       webapi-plugins
--Version:    2.13
++Version:    2.14
  Release:    0
  License:    Apache-2.0 and BSD-3-Clause and MIT
  Group:      Development/Libraries
diff --cc src/alarm/alarm_instance.cc
index 504149cd,1be9f9b1..ad0f4afc
--- a/src/alarm/alarm_instance.cc
+++ b/src/alarm/alarm_instance.cc
@@@ -40,14 -40,6 +40,14 @@@ AlarmInstance::AlarmInstance() 
    // AlarmAbsolute
    RegisterSyncHandler("AlarmAbsolute_getNextScheduledDate",
                        std::bind(&AlarmManager::GetNextScheduledDate, &manager_, _1, _2));
 +
-   // Block of code related to Notification
++// Block of code related to Notification
 +#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE)
 +  RegisterSyncHandler("AlarmManager_addAlarmNotification",
 +                      std::bind(&AlarmManager::AddAlarmNotification, &manager_, _1, _2));
 +  RegisterSyncHandler("AlarmManager_getAlarmNotification",
 +                      std::bind(&AlarmManager::GetAlarmNotification, &manager_, _1, _2));
 +#endif
  }
  
  AlarmInstance::~AlarmInstance() {