Merge branch 'tizen_3.0' into tizen

Change-Id: I548277638db1262351d60536814813b590e0a099

diff --cc src/notification/status_notification.cc
index c6d7bf354d2835c6f2549c484bc764b932083013,1b55a50ca0662e9b6ed35ea24be0a61601448a62..0e9332d9be55a6916a9edfaddef51b50238ecbe6
--- 1/src/notification/status_notification.cc
--- 2/src/notification/status_notification.cc
+++ b/src/notification/status_notification.cc
@@@ -1311,17 -1314,22 +1311,22 @@@ PlatformResult StatusNotification::GetN
      return status;
    }
  
+   double progressValue;
    if (val.contains("progressValue") && !IsNull(noti_obj, "progressValue")) {
-     double progressValue = common::FromJson<double>(noti_obj, "progressValue");
-     status = SetProgressValue(*noti_handle, progress_type, progressValue,
-         is_update);
+     progressValue = common::FromJson<double>(noti_obj, "progressValue");
+   }
+   else {
+     progressValue = -1;
+   }
  
-     if (status.IsError()) {
-       return status;
-     }
 -  status = SetProgressValue(noti_handle, progress_type, progressValue,
++  status = SetProgressValue(*noti_handle, progress_type, progressValue,
+       is_update);
+ 
+   if (status.IsError()) {
+     return status;
    }
  
 -  status = SetText(noti_handle,
 +  status = SetText(*noti_handle,
                     NOTIFICATION_TEXT_TYPE_TITLE,
                     common::FromJson<std::string>(noti_obj, "title"));
    if (status.IsError()) {