Merge "Apply pkgs config for haptic" into tizen_2.1

diff --git a/inc/FAppAppControl.h b/inc/FAppAppControl.h
index 1de000d..609366a 100755 (executable)
--- a/inc/FAppAppControl.h
+++ b/inc/FAppAppControl.h
@@ -107,7 +107,7 @@ _OSP_EXPORT_ extern const Tizen::Base::String APPCONTROL_DIAL;
 * @deprecated This variable is provided only for backward compatibility and will be deleted in the near future.
 *                              Instead of this variable, use the literal, L"tizen.phone" with operation L"http://tizen.org/appcontrol/operation/call".
 * @since       2.0
-* @privilege    http://tizen.org/privilege/systeminfo
+* @privilege    %http://tizen.org/privilege/systeminfo
 *
 * @remarks Privilege is required to use this application control.
 * @endif
@@ -212,7 +212,7 @@ _OSP_EXPORT_ extern const Tizen::Base::String APPCONTROL_AUDIO;
 * @deprecated This variable is provided only for backward compatibility and will be deleted in the near future.
 *                              Instead of this variable, use the literal, L"tizen.internet".
 * @since       2.0
-* @privilege    http://tizen.org/privilege/web.service
+* @privilege    %http://tizen.org/privilege/web.service
 * @endif
 */
 _OSP_EXPORT_ extern const Tizen::Base::String APPCONTROL_BROWSER;
@@ -312,7 +312,7 @@ _OSP_EXPORT_ extern const Tizen::Base::String APPCONTROL_PROVIDER_CALENDAR;
 * @deprecated  This variable is provided only for backward compatibility and will be deleted in the near future.
 *                              Instead of this variable, use the literal, L"tizen.phone".
 * @since                       2.0
-* @privilege    http://tizen.org/privilege/systeminfo
+* @privilege    %http://tizen.org/privilege/systeminfo
 *
 * @remarks Privilege is required to use this application control.
 * @endif
@@ -429,7 +429,7 @@ _OSP_EXPORT_ extern const Tizen::Base::String APPCONTROL_PROVIDER_AUDIO;
 * @deprecated  This variable is provided only for backward compatibility and will be deleted in the near future.
 *                              Instead of this variable, use the literal, L"tizen.internet".
 * @since                       2.0
-* @privilege   http://tizen.org/privilege/web.service
+* @privilege   %http://tizen.org/privilege/web.service
 *
 * @remarks Privilege is required to use this application control.
 * @endif
@@ -1089,7 +1089,7 @@ public:
         *                              IAppControlResponseListener due to lack of argument capability. @n
         *                              Instead of using this method, use Start().
         * @since       2.0
-        * @privilege   http://tizen.org/privilege/application.launch
+        * @privilege   %http://tizen.org/privilege/application.launch
         *
         * @return              An error code
         * @param[in]   pDataList       The data list to deliver to the resolved application control @n
@@ -1122,12 +1122,12 @@ public:
         * application is displayed.
         *
         * @since       2.0
-        * @privilege   http://tizen.org/privilege/application.launch
+        * @privilege   %http://tizen.org/privilege/application.launch
         *
         * @return              An error code
         * @param[in]   pUriData        A pointer to the URI data
         * @param[in]   pDataType       A pointer to the MIME type (RFC 2046) data
-        * @param[in]   pExtraData      A pointer to an argument map of key and value pair where the key is of type String and the value is of type String to deliver to the resolved application @n
+        * @param[in]   pExtraData      A pointer to an argument map of key and value pair where the key is of type String and the value is of type String or of type ArrayList of String to deliver to the resolved application @n
         *                                                      The maximum size is 16 kilo bytes.
         * @param[in]   pListener       The application control callback listener @n
         *                                                      Some application need to get the result by implementing the IAppControlResponseListener interface.
@@ -1155,7 +1155,7 @@ public:
         * When the found application control is started, the URI pattern, MIME type, and extra data is delivered using IAppControlProviderEventListener.
         *
         * @since       2.0
-        * @privilege   http://tizen.org/privilege/application.launch
+        * @privilege   %http://tizen.org/privilege/application.launch
         *
         * @return  An error code
         * @param[in]   operationId     The operation ID

diff --git a/inc/FAppAppManager.h b/inc/FAppAppManager.h
index a0e0dc4..95432f5 100755 (executable)
--- a/inc/FAppAppManager.h
+++ b/inc/FAppAppManager.h
@@ -148,7 +148,7 @@ public:
         *                              Instead of using this method, use AppControl::FindAndStart().
         * @since               2.0
         * @privlevel   public
-        * @privilege   http://tizen.org/privilege/application.launch
+        * @privilege   %http://tizen.org/privilege/application.launch
         *
         * @return      An error code
         * @param[in]   uriData                 The URI that has a maximum size of @c 1024 bytes
@@ -189,7 +189,7 @@ public:
         *                              Instead of using this method, use AppControl::FindAndStart().
         * @since               2.0
         * @privlevel   public
-        * @privilege   http://tizen.org/privilege/application.launch
+        * @privilege   %http://tizen.org/privilege/application.launch
         *
         * @return      An error code
         * @param[in]   pOperationId    The operation ID
@@ -288,7 +288,7 @@ public:
         *                              Instead of using this method, use %LaunchApplication() without launch arguments or AppControl::Start().
         * @since       2.0
         * @privlevel   public
-        * @privilege   http://tizen.org/privilege/application.launch
+        * @privilege   %http://tizen.org/privilege/application.launch
         *
         * @return      An error code
         * @param[in]   appId                           The application's ID to execute
@@ -311,7 +311,7 @@ public:
         *
         * @since       2.0
         * @privlevel   public
-        * @privilege   http://tizen.org/privilege/application.launch
+        * @privilege   %http://tizen.org/privilege/application.launch
         *
         * @return      An error code
         * @param[in]   appId                           The application's ID to execute
@@ -329,7 +329,7 @@ public:
         *
         * @since       2.0
         * @privlevel   partner
-        * @privilege   http://tizen.org/privilege/application.kill
+        * @privilege   %http://tizen.org/privilege/application.kill
         *
         * @return      An error code
         * @param[in]   appId                           The application's ID to execute
@@ -372,7 +372,7 @@ public:
         *
         * @since       2.0
         * @privlevel   public
-        * @privilege   http://tizen.org/privilege/application.launch
+        * @privilege   %http://tizen.org/privilege/application.launch
         *
         * @return              An error code
         * @param[in]   condition         The launch condition for the application @n
@@ -440,7 +440,7 @@ public:
         *
         * @since       2.0
         * @privlevel   public
-        * @privilege   http://tizen.org/privilege/application.launch
+        * @privilege   %http://tizen.org/privilege/application.launch
         *
         * @return              An error code
         * @exception   E_SUCCESS                       The method is successful.
@@ -457,7 +457,7 @@ public:
         *
         * @since               2.0
         * @privlevel   public
-        * @privilege   http://tizen.org/privilege/application.launch
+        * @privilege   %http://tizen.org/privilege/application.launch
         *
         * @return              An error code
         * @param[in]   condition                       The launch condition for the application
@@ -494,7 +494,7 @@ public:
         *
         * @since               2.0
         * @privlevel   partner
-        * @privilege   http://tizen.org/privilege/appmanager.launch
+        * @privilege   %http://tizen.org/privilege/appmanager.launch
         *
         * @return     An error code
         * @param[in]  appId          The ID of the application registered for launch
@@ -546,7 +546,7 @@ public:
         *
         * @since               2.0
         * @privlevel   partner
-        * @privilege   http://tizen.org/privilege/appmanager.launch
+        * @privilege   %http://tizen.org/privilege/appmanager.launch
         *
         * @return     An error code
         * @param[in]  appId          The application ID
@@ -569,7 +569,7 @@ public:
         *
         * @since               2.0
         * @privlevel   partner
-        * @privilege   http://tizen.org/privilege/appmanager.launch
+        * @privilege   %http://tizen.org/privilege/appmanager.launch
         *
         * @return     @c true if a condition is already registered to the specified application with the specified condition, @n
         *             else @c false
@@ -651,7 +651,7 @@ public:
         * @since       2.0
         *
         * @privlevel   partner
-        * @privilege   http://tizen.org/privilege/appusage
+        * @privilege   %http://tizen.org/privilege/appusage
         *
         * @return              An error code
         * @param[in]   listener                                The event listener
@@ -673,7 +673,7 @@ public:
         * @since       2.0
         *
         * @privlevel   partner
-        * @privilege   http://tizen.org/privilege/appusage
+        * @privilege   %http://tizen.org/privilege/appusage
         *
         * @return              An error code
         * @param[in]   listener                                The event listener
@@ -693,7 +693,7 @@ public:
         * @since       2.0
         *
         * @privlevel   partner
-        * @privilege   http://tizen.org/privilege/appusage
+        * @privilege   %http://tizen.org/privilege/appusage
         *
         * @return              An error code
         * @param[out]  appId                                   The AppId of the active application

diff --git a/inc/FAppAppResource.h b/inc/FAppAppResource.h
index a9c5065..2733816 100644 (file)
--- a/inc/FAppAppResource.h
+++ b/inc/FAppAppResource.h
@@ -196,7 +196,7 @@ public:
        * @since        2.0
        *
        * @privlevel    partner
-       * @privilege   http://tizen.org/privilege/appsetting
+       * @privilege   %http://tizen.org/privilege/appsetting
        *
        * @return       A pointer to the %AppResource instance, @n
        *               else @c null if it fails
@@ -217,7 +217,7 @@ public:
        * @since        2.0
        *
        * @privlevel    partner
-       * @privilege   http://tizen.org/privilege/appsetting
+       * @privilege   %http://tizen.org/privilege/appsetting
        *
        * @return       An error code
        * @param[in]    appId                The AppId of the installed application

diff --git a/inc/FAppAppSetting.h b/inc/FAppAppSetting.h
index 7665317..d5d38ca 100644 (file)
--- a/inc/FAppAppSetting.h
+++ b/inc/FAppAppSetting.h
@@ -145,7 +145,7 @@ public:
         * @since       2.0
         *
         * @privlevel   partner
-        * @privilege   http://tizen.org/privilege/appsetting
+        * @privilege   %http://tizen.org/privilege/appsetting
         *
         * @return              A pointer to the %AppSetting instance, @n
         *                              else @c null if it fails
@@ -168,7 +168,7 @@ public:
         * @since       2.0
         *
         * @privlevel   partner
-        * @privilege   http://tizen.org/privilege/appsetting
+        * @privilege   %http://tizen.org/privilege/appsetting
         *
         * @return              An error code
         * @param[in]   appId                           The AppId of the application that has a valid application setting

diff --git a/inc/FAppNotificationManager.h b/inc/FAppNotificationManager.h
index 63925cc..f6f8370 100755 (executable)
--- a/inc/FAppNotificationManager.h
+++ b/inc/FAppNotificationManager.h
@@ -154,7 +154,7 @@ public:
         *
         * @deprecated  This class is deprecated. Instead of using this class, use the Tizen::Shell::NotificationManager class.
         * @since       2.0
-        * @privilege   http://tizen.org/privilege/notification
+        * @privilege   %http://tizen.org/privilege/notification
         *
         * @return              The current badge number
         * @exception   E_SUCCESS                       The method is successful.
@@ -175,7 +175,7 @@ public:
         *
         * @deprecated  This class is deprecated. Instead of using this class, use the Tizen::Shell::NotificationManager class.
         * @since       2.0
-        * @privilege   http://tizen.org/privilege/notification
+        * @privilege   %http://tizen.org/privilege/notification
         *
         * @return              An error code
         * @param[in]   badgeNumber                     The badge number
@@ -197,7 +197,7 @@ public:
         *
         * @deprecated  This class is deprecated. Instead of using this class, use the Tizen::Shell::NotificationManager class.
         * @since       2.0
-        * @privilege   http://tizen.org/privilege/notification
+        * @privilege   %http://tizen.org/privilege/notification
         *
         * @return              An error code
         * @param[in]   messageText                     The notification message
@@ -219,7 +219,7 @@ public:
         *
         * @deprecated  This class is deprecated. Instead of using this class, use the Tizen::Shell::NotificationManager class.
         * @since       2.0
-        * @privilege   http://tizen.org/privilege/notification
+        * @privilege   %http://tizen.org/privilege/notification
         *
         * @return              An error code
         * @param[in]   messageText                     The notification message
@@ -245,7 +245,7 @@ public:
         *
         * @deprecated  This class is deprecated. Instead of using this class, use the Tizen::Shell::NotificationManager class.
         * @since       2.0
-        * @privilege   http://tizen.org/privilege/notification
+        * @privilege   %http://tizen.org/privilege/notification
         *
         * @return              An error code
         * @param[in]   messageText                     The notification message
@@ -273,7 +273,7 @@ public:
         *
         * @deprecated  This class is deprecated. Instead of using this class, use the Tizen::Shell::NotificationManager class.
         * @since                       2.0
-        * @privilege   http://tizen.org/privilege/notification
+        * @privilege   %http://tizen.org/privilege/notification
         *
         * @return              An error code
         * @exception   E_SUCCESS       The method is successful.
@@ -292,7 +292,7 @@ public:
         *
         * @deprecated  This class is deprecated. Instead of using this class, use the Tizen::Shell::NotificationManager class.
         * @since                               2.0
-        * @privilege   http://tizen.org/privilege/notification
+        * @privilege   %http://tizen.org/privilege/notification
         *
         * @return              An error code
         * @param[in]   messageText                     The notification message
@@ -316,7 +316,7 @@ public:
         *
         * @deprecated  This class is deprecated. Instead of using this class, use the Tizen::Shell::NotificationManager class.
         * @since                               2.0
-        * @privilege   http://tizen.org/privilege/notification
+        * @privilege   %http://tizen.org/privilege/notification
         *
         * @return              An error code
         * @param[in]   messageText                     The notification message
@@ -341,7 +341,7 @@ public:
         *
         * @deprecated  This class is deprecated. Instead of using this class, use the Tizen::Shell::NotificationManager class.
         * @since                       2.0
-        * @privilege   http://tizen.org/privilege/notification
+        * @privilege   %http://tizen.org/privilege/notification
         *
         * @return              An error code
         * @exception   E_SUCCESS                       The method is successful.
@@ -360,7 +360,7 @@ public:
         *
         * @deprecated  This class is deprecated. Instead of using this class, use the Tizen::Shell::NotificationManager class.
         * @since       2.0
-        * @privilege   http://tizen.org/privilege/notification
+        * @privilege   %http://tizen.org/privilege/notification
         *
         * @return              The current badge number
         * @param[in]   appId                           The application ID
@@ -384,7 +384,7 @@ public:
         * @since       2.0
         *
         * @privlevel   partner
-        * @privilege   http://tizen.org/privilege/notification
+        * @privilege   %http://tizen.org/privilege/notification
         *
         * @return              An error code
         * @param[in]   appId                           The application ID
@@ -410,7 +410,7 @@ public:
         * @since       2.0
         *
         * @privlevel   partner
-        * @privilege   http://tizen.org/privilege/notification
+        * @privilege   %http://tizen.org/privilege/notification
         *
         * @return              An error code
         * @param[in]   appId                           The application ID
@@ -436,7 +436,7 @@ public:
         * @since       2.0
         *
         * @privlevel   partner
-        * @privilege   http://tizen.org/privilege/notification
+        * @privilege   %http://tizen.org/privilege/notification
         *
         * @return              An error code
         * @param[in]   appId                           The application ID
@@ -466,7 +466,7 @@ public:
         * @since               2.0
         *
         * @privlevel   partner
-        * @privilege   http://tizen.org/privilege/notification
+        * @privilege   %http://tizen.org/privilege/notification
         *
         * @return             An error code
         * @param[in]  appId                            The application ID
@@ -495,7 +495,7 @@ public:
         * @since                               2.0
         *
         * @privlevel   partner
-        * @privilege   http://tizen.org/privilege/notification
+        * @privilege   %http://tizen.org/privilege/notification
         *
         * @return              An error code
         * @param[in]   appId                           The application ID
@@ -521,7 +521,7 @@ public:
         * @since                               2.0
         *
         * @privlevel   partner
-        * @privilege   http://tizen.org/privilege/notification
+        * @privilege   %http://tizen.org/privilege/notification
         *
         * @return              An error code
         * @param[in]   appId                           The application ID
@@ -550,7 +550,7 @@ public:
         * @since                       2.0
         *
         * @privlevel   partner
-        * @privilege   http://tizen.org/privilege/notification
+        * @privilege   %http://tizen.org/privilege/notification
         *
         * @return              An error code
         * @param[in]   appId                           The application ID
@@ -573,7 +573,7 @@ public:
         * @since                       2.0
         *
         * @privlevel   partner
-        * @privilege   http://tizen.org/privilege/notification
+        * @privilege   %http://tizen.org/privilege/notification
         *
         * @return              An error code
         * @param[in]   appId                           The application ID

diff --git a/inc/FAppPkgPackageInfo.h b/inc/FAppPkgPackageInfo.h
index d02076e..a8ac077 100644 (file)
--- a/inc/FAppPkgPackageInfo.h
+++ b/inc/FAppPkgPackageInfo.h
@@ -228,7 +228,7 @@ public:
         *
         * @since       2.0
         * @privlevel   platform
-        * @privilege   http://tizen.org/privilege/packagesetting
+        * @privilege   %http://tizen.org/privilege/packagesetting
         *
         * @return The package type
         */

diff --git a/inc/FAppPkgPackageLicenseManager.h b/inc/FAppPkgPackageLicenseManager.h
index 0dd4cce..263ead1 100755 (executable)
--- a/inc/FAppPkgPackageLicenseManager.h
+++ b/inc/FAppPkgPackageLicenseManager.h
@@ -50,7 +50,7 @@ public:
        *
        * @since 2.1
        * @privlevel    platform
-       * @privilege    http://tizen.org/privilege/packagelicensemanager
+       * @privilege    %http://tizen.org/privilege/packagelicensemanager
        *
        * @return               An error code
        * @param[in]    licenseRequestInfo      The string buffer of license request information
@@ -73,7 +73,7 @@ public:
        *
        * @since 2.1
        * @privlevel    platform
-       * @privilege    http://tizen.org/privilege/packagelicensemanager
+       * @privilege    %http://tizen.org/privilege/packagelicensemanager
        *
        * @return               An error code
        * @param[in]    rightObject                     The Package DRM license (right object)
@@ -96,7 +96,7 @@ public:
        *
        * @since 2.1
        * @privlevel    platform
-       * @privilege    http://tizen.org/privilege/packagelicensemanager
+       * @privilege    %http://tizen.org/privilege/packagelicensemanager
        *
        * @return               The remaining time of the DRM license @n
        *                               If the remaining time is unlimited, the return value of Tizen::Base::TimeSpan's days will be set to @c 9999.
@@ -120,7 +120,7 @@ public:
        *
        * @since 2.1
        * @privlevel    platform
-       * @privilege    http://tizen.org/privilege/packagelicensemanager
+       * @privilege    %http://tizen.org/privilege/packagelicensemanager
        *
        * @return               An error code
        * @param[in]    licenseInfo                     The CEK (Contents Encryption Key)

diff --git a/inc/FAppPkgPackageManager.h b/inc/FAppPkgPackageManager.h
index a489814..e472278 100644 (file)
--- a/inc/FAppPkgPackageManager.h
+++ b/inc/FAppPkgPackageManager.h
@@ -87,7 +87,7 @@ public:
         *
         * @since       2.0
         * @privlevel   public
-        * @privilege   http://tizen.org/privilege/packageinfo
+        * @privilege   %http://tizen.org/privilege/packageinfo
         *
         * @return              An error code
         * @param[in]   listener                        The package installation event listener
@@ -102,7 +102,7 @@ public:
         *
         * @since       2.0
         * @privlevel   public
-        * @privilege   http://tizen.org/privilege/packageinfo
+        * @privilege   %http://tizen.org/privilege/packageinfo
         *
         * @return              An error code
         * @param[in]   listener                        The package installation event listener
@@ -117,7 +117,7 @@ public:
         *
         * @since       2.0
         * @privlevel   public
-        * @privilege   http://tizen.org/privilege/packageinfo
+        * @privilege   %http://tizen.org/privilege/packageinfo
         *
         * @return              A pointer to PackageInfo
         * @param[in]   packageId                               The package ID
@@ -135,7 +135,7 @@ public:
         *
         * @since       2.0
         * @privlevel   public
-        * @privilege   http://tizen.org/privilege/packageinfo
+        * @privilege   %http://tizen.org/privilege/packageinfo
         *
         * @return              A pointer to PackageAppInfo
         * @param[in]   appId                           The application ID
@@ -152,7 +152,7 @@ public:
         *
         * @since       2.0
         * @privlevel   public
-        * @privilege   http://tizen.org/privilege/packageinfo
+        * @privilege   %http://tizen.org/privilege/packageinfo
         *
         * @return              A pointer to the list of the PackageInfo instances, @n
         *                              else @c null if it fails
@@ -168,7 +168,7 @@ public:
         *
         * @since       2.0
         * @privlevel   public
-        * @privilege   http://tizen.org/privilege/packageinfo
+        * @privilege   %http://tizen.org/privilege/packageinfo
         *
         * @return      @c true if a package is installed, @n
         *                      else @c false
@@ -187,7 +187,7 @@ public:
         *
         * @since       2.0
         * @privlevel   platform
-        * @privilege   http://tizen.org/privilege/packagemanager.install
+        * @privilege   %http://tizen.org/privilege/packagemanager.install
         *
         * @return              An error code
         * @param[in]   packageId                       The package ID
@@ -208,7 +208,7 @@ public:
         *
         * @since       2.0
         * @privlevel   platform
-        * @privilege   http://tizen.org/privilege/packagemanager.install
+        * @privilege   %http://tizen.org/privilege/packagemanager.install
         *
         * @return              An error code
         * @param[in]   packageId                               The package ID
@@ -228,7 +228,7 @@ public:
         *
         * @since       2.0
         * @privlevel   platform
-        * @privilege   http://tizen.org/privilege/packagesetting
+        * @privilege   %http://tizen.org/privilege/packagesetting
         *
         * @return              An error code
         * @param[in]   packageId                               The package ID
@@ -247,7 +247,7 @@ public:
         *
         * @since       2.0
         * @privlevel   platform
-        * @privilege   http://tizen.org/privilege/packagesetting
+        * @privilege   %http://tizen.org/privilege/packagesetting
         *
         * @return              An error code
         * @param[in]   packageId                               The package ID
@@ -266,7 +266,7 @@ public:
        *
        * @since         2.1
        * @privlevel     platform
-       * @privilege     http://tizen.org/privilege/packagemanager.info
+       * @privilege     %http://tizen.org/privilege/packagemanager.info
        *
        * @return        A pointer to the %PackageInfo instance, @n
        *               else @c null if it fails
@@ -286,7 +286,7 @@ public:
        *
        * @since         2.1
        * @privlevel     public
-       * @privilege     http://tizen.org/privilege/package.info
+       * @privilege     %http://tizen.org/privilege/package.info
        *
        * @return        A pointer to the list of the %PackageInfo instances, @n
        *                else @c null if it fails
@@ -306,7 +306,7 @@ public:
        *
        * @since         2.1
        * @privlevel     public
-       * @privilege     http://tizen.org/privilege/package.info
+       * @privilege     %http://tizen.org/privilege/package.info
        *
        * @return        A pointer to the list of the %PackageAppInfo instances, @n
        *                else @c null if it fails
@@ -326,7 +326,7 @@ public:
        *
        * @since         2.1
        * @privlevel     public
-       * @privilege     http://tizen.org/privilege/package.info
+       * @privilege     %http://tizen.org/privilege/package.info
        *
        * @return        A pointer to the list of the %PackageAppInfo instances, @n
        *                              else @c null if it fails

diff --git a/inc/FIo.h b/inc/FIo.h
index f7daecf..d5babaa 100644 (file)
--- a/inc/FIo.h
+++ b/inc/FIo.h
@@ -47,6 +47,9 @@
 #include <FIoIMmcStorageMountListener.h>
 #include <FIoIMmcStorageFormatListener.h>
 #include <FIoFileLock.h>
+#include <FIoDataRow.h>
+#include <FIoDataSetEnumerator.h>
+#include <FIoDataSet.h>
 
 /**
  * @namespace  Tizen::Io

diff --git a/inc/FIoMmcStorageManager.h b/inc/FIoMmcStorageManager.h
index e993346..b21970b 100644 (file)
--- a/inc/FIoMmcStorageManager.h
+++ b/inc/FIoMmcStorageManager.h
@@ -69,7 +69,7 @@ public:
        *
        * @since                2.0
        * @privlevel    platform
-       * @privilege    http://tizen.org/privilege/systemsetting.read
+       * @privilege    %http://tizen.org/privilege/systemsetting.read
        *
        * @return               An error code
        * @exception    E_SUCCESS                       Mount operation is successfully started.
@@ -87,7 +87,7 @@ public:
        *
        * @since                2.0
        * @privlevel    platform
-       * @privilege    http://tizen.org/privilege/systemsetting.read
+       * @privilege    %http://tizen.org/privilege/systemsetting.read
        *
        * @return               An error code
        * @exception    E_SUCCESS                       Unmount operation is successfully started.
@@ -103,7 +103,7 @@ public:
        *
        * @since                2.0
        * @privlevel    platform
-       * @privilege    http://tizen.org/privilege/systemsetting.read
+       * @privilege    %http://tizen.org/privilege/systemsetting.read
        *
        * @return               An error code
        * @exception    E_SUCCESS                       Format operation is successfully started.

diff --git a/inc/FSecCertX509CertificateStore.h b/inc/FSecCertX509CertificateStore.h
index 6d8d194..8207122 100644 (file)
--- a/inc/FSecCertX509CertificateStore.h
+++ b/inc/FSecCertX509CertificateStore.h
@@ -69,7 +69,7 @@ public:
         *      @since                  2.0
         *
         *      @privlevel              partner
-        *      @privilege              http://tizen.org/privilege/certificate.read
+        *      @privilege              %http://tizen.org/privilege/certificate.read
         *
         *      @return                 An error code
         *      @param[out]             name                            The name of the certificate store
@@ -84,7 +84,7 @@ public:
         *      @since                  2.0
         *
         *      @privlevel              partner
-        *      @privilege              http://tizen.org/privilege/certificate.read
+        *      @privilege              %http://tizen.org/privilege/certificate.read
         *
         *      @return                 An error code
         *      @param[in]              selector                        A selector that defines a set of criterion for selecting certificates
@@ -103,7 +103,7 @@ public:
         *      @since                  2.0
         *
         *      @privlevel              partner
-        *      @privilege              http://tizen.org/privilege/certificate.read
+        *      @privilege              %http://tizen.org/privilege/certificate.read
         *
         *      @return                 An error code
         *      @param[out]             count                                   The count of certificates
@@ -118,7 +118,7 @@ public:
         *      @since                  2.0
         *
         *      @privlevel              partner
-        *      @privilege              http://tizen.org/privilege/certificate.read
+        *      @privilege              %http://tizen.org/privilege/certificate.read
         *
         *      @return                 The certificates that matches the specified selector
         *      @exception              E_SUCCESS                       The method is successful.
@@ -136,7 +136,7 @@ public:
         *      @since                  2.0
         *
         *      @privlevel              partner
-        *      @privilege              http://tizen.org/privilege/certificate.write
+        *      @privilege              %http://tizen.org/privilege/certificate.write
         *
         *      @return                 An error code
         *      @param[in]              certificateType         The type of the Certificate (ROOT_CA, OPERATOR_DOMAIN, or TRUSTED_THIRD_PARTY_DOMAIN)
@@ -157,7 +157,7 @@ public:
         *      @since                  2.0
         *
         *      @privlevel              partner
-        *      @privilege              http://tizen.org/privilege/certificate.write
+        *      @privilege              %http://tizen.org/privilege/certificate.write
         *
         *      @return                 An error code
         *      @param[in]              certificateType         The type of the Certificate (ROOT_CA, OPERATOR_DOMAIN, or TRUSTED_THIRD_PARTY_DOMAIN)
@@ -180,7 +180,7 @@ public:
         *      @since                  2.0
         *
         *      @privlevel              partner
-        *      @privilege              http://tizen.org/privilege/certificate.write
+        *      @privilege              %http://tizen.org/privilege/certificate.write
         *
         *      @return                 An error code
         *      @param[in]              certificateType         The type of the Certificate (ROOT_CA, OPERATOR_DOMAIN, TRUSTED_THIRD_PARTY_DOMAIN)
@@ -202,7 +202,7 @@ public:
         *      @since 2.0
         *
         *      @privlevel              partner
-        *      @privilege              http://tizen.org/privilege/certificate.write
+        *      @privilege              %http://tizen.org/privilege/certificate.write
         *
         *      @return                 An error code
         *  @param[in]          filePath                        The file path of PKCS 12 certificate to insert

diff --git a/inc/FSecPrivacyManager.h b/inc/FSecPrivacyManager.h
index 6265248..168ffb1 100755 (executable)
--- a/inc/FSecPrivacyManager.h
+++ b/inc/FSecPrivacyManager.h
@@ -74,7 +74,7 @@ public:
         *
         * @since               2.1
         * @privlevel   platform
-        * @privilege   http://tizen.org/privilege/privacymanager.read
+        * @privilege   %http://tizen.org/privilege/privacymanager.read
         *
         * @return              A pointer to the list of application packages (PackageId) which access user's privacy information, @n
         *                              else @c null if an error occurs
@@ -92,7 +92,7 @@ public:
         *
         * @since               2.1
         * @privlevel   platform
-        * @privilege   http://tizen.org/privilege/privacymanager.read
+        * @privilege   %http://tizen.org/privilege/privacymanager.read
         *
         * @return              A pointer to the privacy information list (Privacyinfo), @n
         *                              else @c null if an error occurs
@@ -111,7 +111,7 @@ public:
         *
         * @since               2.1
         * @privlevel   platform
-        * @privilege   http://tizen.org/privilege/privacymanager.write
+        * @privilege   %http://tizen.org/privilege/privacymanager.write
         *
         * @return              An error code
         * @param[in]   packageId                               The package ID

diff --git a/inc/FSysAlarm.h b/inc/FSysAlarm.h
index f59dafd..d63392e 100644 (file)
--- a/inc/FSysAlarm.h
+++ b/inc/FSysAlarm.h
@@ -83,7 +83,7 @@ public:
         *
         * @since       2.0
         *
-        * @privilege   http://tizen.org/privilege/alarm
+        * @privilege   %http://tizen.org/privilege/alarm
         *
         * @return      An error code
         * @param[in]   duetime                 The time for the alarm to ring
@@ -100,7 +100,7 @@ public:
         *
         * @since       2.0
         *
-        * @privilege   http://tizen.org/privilege/alarm
+        * @privilege   %http://tizen.org/privilege/alarm
         *
         * @return      An error code
         * @param[in]   start                   The time for the alarm to ring first
@@ -119,7 +119,7 @@ public:
         *
         * @since       2.0
         *
-        * @privilege   http://tizen.org/privilege/alarm
+        * @privilege   %http://tizen.org/privilege/alarm
         *
         * @return      An error code
         * @exception   E_SUCCESS               The method is successful.

diff --git a/inc/FSysPowerManager.h b/inc/FSysPowerManager.h
index c971051..d21e9f5 100644 (file)
--- a/inc/FSysPowerManager.h
+++ b/inc/FSysPowerManager.h
@@ -97,7 +97,7 @@ public:
         * @since       2.0
         *
         * @privlevel   public
-        * @privilege   http://tizen.org/privilege/power
+        * @privilege   %http://tizen.org/privilege/power
         *
         * @return      An error code
         * @param[in]   keepOn  Set to @c true if the screen remains in the 'ON' state until the application goes to the background(inactivated), @n
@@ -130,7 +130,7 @@ public:
         * @since       2.0
         *
         * @privlevel   public
-        * @privilege   http://tizen.org/privilege/power
+        * @privilege   %http://tizen.org/privilege/power
         *
         * @return      An error code
         * @param[in]   brightness              The brightness level to set @n
@@ -178,7 +178,7 @@ public:
         * @since       2.0
         *
         * @privlevel   public
-        * @privilege   http://tizen.org/privilege/power
+        * @privilege   %http://tizen.org/privilege/power
         *
         * @return      An error code
         * @exception   E_SUCCESS               The method is successful.
@@ -193,7 +193,7 @@ public:
         * @since       2.0
         *
         * @privlevel   public
-        * @privilege   http://tizen.org/privilege/power
+        * @privilege   %http://tizen.org/privilege/power
         *
         * @return      An error code
         * @exception   E_SUCCESS               The method is successful.
@@ -208,7 +208,7 @@ public:
         * @since       2.0
         *
         * @privlevel   public
-        * @privilege   http://tizen.org/privilege/power
+        * @privilege   %http://tizen.org/privilege/power
         *
         * @return      An error code
         * @param[in]   enable  Set to @c true to prevent the CPU from going into sleep mode, @n

diff --git a/inc/FSysSettingInfo.h b/inc/FSysSettingInfo.h
index 43d57e4..f8048a5 100644 (file)
--- a/inc/FSysSettingInfo.h
+++ b/inc/FSysSettingInfo.h
@@ -212,7 +212,7 @@ public:
         * @since 2.0
         *
         * @privilege   public
-        * @privilege   http://tizen.org/privilege/setting
+        * @privilege   %http://tizen.org/privilege/setting
         *
         * @return      An error code
         * @param[in]   key                     The <a href="../org.tizen.native.appprogramming/html/guide/system/settings_info.htm">key name</a> of the setting information
@@ -232,7 +232,7 @@ public:
         * @since 2.0
         *
         * @privilege   public
-        * @privilege   http://tizen.org/privilege/setting
+        * @privilege   %http://tizen.org/privilege/setting
         *
         * @return      An error code
         * @param[in]   key                     The <a href="../org.tizen.native.appprogramming/html/guide/system/settings_info.htm">key name</a> of the setting information
@@ -252,7 +252,7 @@ public:
         * @since 2.0
         *
         * @privilege   public
-        * @privilege   http://tizen.org/privilege/setting
+        * @privilege   %http://tizen.org/privilege/setting
         *
         * @return      An error code
         * @param[in]   key                     The <a href="../org.tizen.native.appprogramming/html/guide/system/settings_info.htm">key name</a> of the setting information
@@ -272,7 +272,7 @@ public:
         * @since       2.0
         *
         * @privilege   public
-        * @privilege   http://tizen.org/privilege/setting
+        * @privilege   %http://tizen.org/privilege/setting
         *
         * @return      An error code
         * @param[in]   filePath                The file path of the wallpaper
@@ -290,7 +290,7 @@ public:
         * @since       2.0
         *
         * @privilege   public
-        * @privilege   http://tizen.org/privilege/setting
+        * @privilege   %http://tizen.org/privilege/setting
         *
         * @return      An error code
         * @param[in]   filePath                The file path of the ringtone
@@ -307,7 +307,7 @@ public:
         * @since       2.0
         *
         * @privilege   public
-        * @privilege   http://tizen.org/privilege/setting
+        * @privilege   %http://tizen.org/privilege/setting
         *
         * @return      An error code
         * @param[in]   soundCategory           The sound volume category
@@ -355,7 +355,7 @@ public:
         * @since 2.0
         *
         * @privlevel   platform
-        * @privilege   http://tizen.org/privilege/systemsetting.read
+        * @privilege   %http://tizen.org/privilege/systemsetting.read
         *
         * @return      An error code
         * @param[in]   key     The <a href="../org.tizen.native.appprogramming/html/guide/system/settings_info.htm">key name</a> of the setting information
@@ -374,7 +374,7 @@ public:
         * @since 2.0
         *
         * @privlevel   platform
-        * @privilege   http://tizen.org/privilege/systemsetting.write
+        * @privilege   %http://tizen.org/privilege/systemsetting.write
         *
         * @return      An error code
         * @param[in]   key     The <a href="../org.tizen.native.appprogramming/html/guide/system/settings_info.htm">key name</a> of the setting information
@@ -393,7 +393,7 @@ public:
         *
         * @since 2.0
         * @privlevel   platform
-        * @privilege   http://tizen.org/privilege/systemsetting.write
+        * @privilege   %http://tizen.org/privilege/systemsetting.write
         *
         * @return      An error code
         * @param[in]   key                     The <a href="../org.tizen.native.appprogramming/html/guide/system/settings_info.htm">key name</a> of the setting information
@@ -414,7 +414,7 @@ public:
         * @since 2.0
         *
         * @privlevel   platform
-        * @privilege   http://tizen.org/privilege/systemsetting.write
+        * @privilege   %http://tizen.org/privilege/systemsetting.write
         *
         * @return      An error code
         * @param[in]   key                     The <a href="../org.tizen.native.appprogramming/html/guide/system/settings_info.htm">key name</a> of the setting information
@@ -435,7 +435,7 @@ public:
         * @since 2.0
         *
         * @privlevel   platform
-        * @privilege   http://tizen.org/privilege/systemsetting.write
+        * @privilege   %http://tizen.org/privilege/systemsetting.write
         *
         * @return      An error code
         * @exception   E_SUCCESS               The method is successful.

diff --git a/inc/FSysSystemInfo.h b/inc/FSysSystemInfo.h
index 8f0d05e..91f2d3f 100644 (file)
--- a/inc/FSysSystemInfo.h
+++ b/inc/FSysSystemInfo.h
@@ -212,7 +212,7 @@ public:
         * @since 2.0
         *
         * @privlevel   public
-        * @privilege   http://tizen.org/privilege/platforminfo
+        * @privilege   %http://tizen.org/privilege/platforminfo
         *
         * @return      An error code
         * @param[out]  platformVersion         The platform version
@@ -228,7 +228,7 @@ public:
         * @since 2.0
         *
         * @privlevel   public
-        * @privilege   http://tizen.org/privilege/platforminfo
+        * @privilege   %http://tizen.org/privilege/platforminfo
         *
         * @return      An error code
         * @param[out]  nativeApiVersion        The Native API version
@@ -244,7 +244,7 @@ public:
         * @since 2.0
         *
         * @privlevel   public
-        * @privilege   http://tizen.org/privilege/platforminfo
+        * @privilege   %http://tizen.org/privilege/platforminfo
         *
         * @return      An error code
         * @param[out]  webApiVersion           The %Tizen API version
@@ -260,7 +260,7 @@ public:
         * @since 2.1
         *
         * @privlevel   public
-        * @privilege   http://tizen.org/privilege/platforminfo
+        * @privilege   %http://tizen.org/privilege/platforminfo
         *
         * @return      An error code
         * @param[out]  buildInfo               The %Tizen build information
@@ -276,7 +276,7 @@ public:
         * @since       2.0
         *
         * @privlevel   partner
-        * @privilege   http://tizen.org/privilege/useridentity
+        * @privilege   %http://tizen.org/privilege/useridentity
         *
         * @return      An error code
         * @param[out]  imei                    The IMEI of the device

diff --git a/inc/FSysSystemTime.h b/inc/FSysSystemTime.h
index 4d6318a..f80ddbd 100644 (file)
--- a/inc/FSysSystemTime.h
+++ b/inc/FSysSystemTime.h
@@ -118,7 +118,7 @@ public:
         * @since 2.0
         *
         * @privlevel   platform
-        * @privilege   http://tizen.org/privilege/systemsetting.write
+        * @privilege   %http://tizen.org/privilege/systemsetting.write
         *
         * @return      An error code
         * @param[in]   currentTime             The current system time in UTC

diff --git a/inc/FSysVibrator.h b/inc/FSysVibrator.h
index 11a1dd3..e0873a5 100644 (file)
--- a/inc/FSysVibrator.h
+++ b/inc/FSysVibrator.h
@@ -152,7 +152,7 @@ public:
          *
          * @since 2.1
          *
-         * @privilege     http://tizen.org/privilege/vibrator
+         * @privilege     %http://tizen.org/privilege/vibrator
          *
          * @return      An error code
          *
@@ -178,7 +178,7 @@ public:
         * @deprecated This method is deprecated. Instead of using this method, use Start(IntensityDurationVibrationPattern[] patterns, int length, int repeatCount).
         *
         * @privlevel   public
-        * @privilege   http://tizen.org/privilege/vibrator
+        * @privilege   %http://tizen.org/privilege/vibrator
         *
         * @return      An error code
         * @param[in]   onPeriod    The period in milliseconds when the vibrator is on @n
@@ -212,7 +212,7 @@ public:
         * @deprecated This method is deprecated. Instead of using this method, use Start(IntensityDurationVibrationPattern[] patterns, int length, int repeatCount).
         *
         * @privlevel   public
-        * @privilege   http://tizen.org/privilege/vibrator
+        * @privilege   %http://tizen.org/privilege/vibrator
         *
         * @return      An error code
         * @param[in]   milliseconds    The duration for the vibration in milliseconds @n
@@ -238,7 +238,7 @@ public:
         * @since   2.0
         *
         * @privlevel   public
-        * @privilege   http://tizen.org/privilege/vibrator
+        * @privilege   %http://tizen.org/privilege/vibrator
         *
         * @return      An error code
         * @exception   E_SUCCESS           The method is successful.

diff --git a/packaging/osp-appfw.spec b/packaging/osp-appfw.spec
index 39b8495..738641a 100755 (executable)
--- a/packaging/osp-appfw.spec
+++ b/packaging/osp-appfw.spec
@@ -51,6 +51,7 @@ BuildRequires:  pkgconfig(zlib)
 BuildRequires:  pkgconfig(drm-service-core-intel)
 BuildRequires:  pkgconfig(haptic)
 BuildRequires:  pkgconfig(x11)
+BuildRequires:  privacy-manager-client-devel
 BuildRequires:  boost-devel
 BuildRequires:  gettext-tools
 

diff --git a/src/app/FApp_AppArg.cpp b/src/app/FApp_AppArg.cpp
index 2d5a38e..bc319ed 100755 (executable)
--- a/src/app/FApp_AppArg.cpp
+++ b/src/app/FApp_AppArg.cpp
@@ -637,9 +637,8 @@ _AppArg::AddStrArray(bundle* b, const String& key, const IList* pList)
 
 
 result
-_AppArg::AddStrArray(bundle* b, const char* key, const IList* pList)
+_AppArg::AddStrArray(bundle* pb, const char* key, const IList* pList)
 {
-       bundle* pb = b;
        SysTryReturnResult(NID_APP, pb != NULL, E_INVALID_ARG, "Empty bundle.");
 
        if (pList == null || pList->GetCount() == 0)
@@ -648,47 +647,11 @@ _AppArg::AddStrArray(bundle* b, const char* key, const IList* pList)
                return E_SUCCESS;
        }
 
-       int i = 0;
-       const int count = pList->GetCount();
-
-       const char** pSa = new (std::nothrow) const char*[count];
-       SysTryReturnResult(NID_APP, pSa != null, E_OUT_OF_MEMORY, "Memory allocation failure with cound %d.", count);
-
-       for (i = 0; i < count; i++)
-       {
-               pSa[i] = null;
-
-               const String* pStr = static_cast<const String*>(pList->GetAt(i));
-               if (pStr)
-               {
-                       pSa[i] = _StringConverter::CopyToCharArrayN(*pStr);
-               }
-       }
-
-       result r = E_SUCCESS;
-
-       int ret = bundle_add_str_array(pb, key, pSa, count);
-       if (ret >= 0)
-       {
-               _AppMessageImpl::AddData(pb, pList);
-       }
-       else
-       {
-               SysLog(NID_APP, "Bundle add failre :%d.", ret);
-               r = E_SYSTEM;
-       }
+       _AppMessageImpl::AddValueArray(pb, key, pList);
 
        _AppMessageImpl::AddData(pb, pList);
 
-//CATCH:
-       for (i = 0; i < count; i++)
-       {
-               delete[] pSa[i];
-       }
-
-       delete[] pSa;
-
-       return r;
+       return E_SUCCESS;
 }
 
 
@@ -723,11 +686,11 @@ _AppArg::AddStrMap(bundle* b, const IMap* pMap)
                        else if (typeid(*pObj) == typeid(const ArrayList))
                        {
                                const ArrayList* pList = static_cast<const ArrayList*>(pEnum->GetValue());
-                               if (pList && *pKey == TIZEN_APPCONTROL_DATA_LEGACY)
+                               if (pList)
                                {
-                                       SysLog(NID_APP, "Legacy AppControl argument");
-                                       _AppArg::AddStrArray(pb, OSP_K_ARG, pList);
-                                       _AppMessageImpl::AddData(pb, pList);
+                                       SysLog(NID_APP, "ArrayList type");
+
+                                       _AppMessageImpl::AddValueArray(pb, *pKey, pList);
                                }
                        }
                        else if (typeid(*pObj) == typeid(const ByteBuffer))

diff --git a/src/app/FApp_AppMessageImpl.cpp b/src/app/FApp_AppMessageImpl.cpp
index 33b5d81..1eedd98 100644 (file)
--- a/src/app/FApp_AppMessageImpl.cpp
+++ b/src/app/FApp_AppMessageImpl.cpp
@@ -277,4 +277,54 @@ _AppMessageImpl::GetValueArray(bundle* pBundle, const char* pKey)
        return pArray;
 }
 
+result
+_AppMessageImpl::AddValueArray(bundle* pBundle, const String& key, const IList* pList)
+{
+       std::unique_ptr<char[]> pKey(_StringConverter::CopyToCharArrayN(key));
+
+       return AddValueArray(pBundle, pKey.get(), pList);
+}
+
+result
+_AppMessageImpl::AddValueArray(bundle* pBundle, const char* pKey, const IList* pList)
+{
+       SysTryReturnResult(NID_APP, pBundle != NULL, E_INVALID_ARG, "Empty bundle.");
+
+       if (pList == null || pList->GetCount() == 0)
+       {
+               SysLog(NID_APP, "No element added for bundle.");
+               return E_SUCCESS;
+       }
+
+       int i = 0;
+       const int count = pList->GetCount();
+
+       const char** pSa = new (std::nothrow) const char*[count];
+       SysTryReturnResult(NID_APP, pSa != null, E_OUT_OF_MEMORY, "Memory allocation failure with cound %d.", count);
+
+       // element is deliverately iterate with GetAt() for IList
+       for (i = 0; i < count; i++)
+       {
+               pSa[i] = null;
+
+               const String* pStr = static_cast<const String*>(pList->GetAt(i));
+               if (pStr)
+               {
+                       pSa[i] = _StringConverter::CopyToCharArrayN(*pStr);
+                       //SysLog(NID_APP, "%s", pSa[i]);
+               }
+       }
+
+       int ret = bundle_add_str_array(pBundle, pKey, pSa, count);
+
+       for (i = 0; i < count; i++)
+       {
+               delete[] pSa[i];
+       }
+
+       delete[] pSa;
+
+       return (ret == 0) ? E_SUCCESS : E_SYSTEM;
+}
+
 }} // Tizen::App

diff --git a/src/app/inc/FApp_AppMessageImpl.h b/src/app/inc/FApp_AppMessageImpl.h
index 7e94722..0bfb8f7 100644 (file)
--- a/src/app/inc/FApp_AppMessageImpl.h
+++ b/src/app/inc/FApp_AppMessageImpl.h
@@ -83,9 +83,11 @@ public:
        static result AddStringMap(bundle* pBundle,  const Tizen::Base::Collection::IMap* pMap);
 
        static Tizen::Base::Collection::ArrayList* GetValueArray(bundle* pBundle, const char* pKey);
-
        static Tizen::Base::Collection::ArrayList* GetValueArray(bundle* pBundle, const Tizen::Base::String& key);
 
+       static result AddValueArray(bundle* pBundle, const char* pKey, const Tizen::Base::Collection::IList* pList);
+       static result AddValueArray(bundle* pBundle, const Tizen::Base::String& key, const Tizen::Base::Collection::IList* pList);
+
 private:
        bundle* __pBundle;
 };

diff --git a/src/appfw/CMakeLists.txt b/src/appfw/CMakeLists.txt
index a8674c1..0bcb50e 100644 (file)
--- a/src/appfw/CMakeLists.txt
+++ b/src/appfw/CMakeLists.txt
@@ -82,6 +82,7 @@ TARGET_LINK_LIBRARIES(${this_target} "-lz" )
 TARGET_LINK_LIBRARIES(${this_target} "-lalarm" )
 TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib -ldrm-service-core-intel")
 TARGET_LINK_LIBRARIES(${this_target} "-lecore" )
+TARGET_LINK_LIBRARIES(${this_target} "-lprivacy-manager-client" )
 
 
 SET_TARGET_PROPERTIES(${this_target}

diff --git a/src/base/runtime/FBaseRt_WaitingLoopImpl.cpp b/src/base/runtime/FBaseRt_WaitingLoopImpl.cpp
index 6ab4c7b..9d1862b 100755 (executable)
--- a/src/base/runtime/FBaseRt_WaitingLoopImpl.cpp
+++ b/src/base/runtime/FBaseRt_WaitingLoopImpl.cpp
@@ -133,11 +133,6 @@ _WaitingLoopImpl::Wait(int timeout)
        __timeout = false;
        __waitType = WAIT_TIMEOUT;
 
-       if (__maxTimeout < timeout)
-       {
-               timeout = __maxTimeout;
-       }
-
        result r = __pTimer->Start(timeout);
 
        SysTryReturn(NID_BASE_RT, r == E_SUCCESS, r, r,"[%s]Timer does not start.", GetErrorMessage(r));
@@ -210,11 +205,6 @@ _WaitingLoopImpl::Wait(int timeout, IWaitingLoopCondition& condition)
        __waitType = WAIT_TIMEOUT_CONDITION;
        __pWaitingLoopCondition = &condition;
 
-       if(timeout > __maxTimeout)
-       {
-               timeout = __maxTimeout;
-       }
-
        if (timeout < __waitingRepeatableTime)
        {
                result r = __pTimer->StartAsRepeatable(__waitingRepeatableTime);

diff --git a/src/security/CMakeLists.txt b/src/security/CMakeLists.txt
index 8f6cc12..4faa46e 100755 (executable)
--- a/src/security/CMakeLists.txt
+++ b/src/security/CMakeLists.txt
@@ -3,6 +3,7 @@ SET (this_target security)
 INCLUDE_DIRECTORIES(
        ${SLP_INCLUDE_DIRS}     
        /usr/include/chromium
+       /usr/include/privacy_manager
        cert
        inc
        ./

diff --git a/src/security/FSec_PrivacyManagerImpl.cpp b/src/security/FSec_PrivacyManagerImpl.cpp
index a15f317..e5b437a 100755 (executable)
--- a/src/security/FSec_PrivacyManagerImpl.cpp
+++ b/src/security/FSec_PrivacyManagerImpl.cpp
@@ -21,9 +21,12 @@
  */
 
 #include <new>
+#include <privacy_manager_client.h>
 #include <FSecPrivacyManager.h>
 #include <FBaseSysLog.h>
 #include "FSec_PrivacyManagerImpl.h"
+#include <FBase_StringConverter.h>
+#include <FSecPrivacyInfo.h>
 
 using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
@@ -48,24 +51,78 @@ _PrivacyManagerImpl::GetInstance(PrivacyManager& privacyManager)
        return privacyManager.__pPrivacyManagerImpl;
 }
 
+
+bool GetPrivacyAppPackageListNCallback(const char *package_id, void* user_data)
+{
+       result r = E_SUCCESS;
+       ArrayList* pList = static_cast < ArrayList* >(user_data);
+
+       pList->Add(new String(package_id));
+       return true;
+}
+
 Tizen::Base::Collection::IList*
 _PrivacyManagerImpl::GetPrivacyAppPackageListN(void) const
 {
-       return null;
+       ArrayList* pPackageIdList = null;
+       int ret = 0;
 
+       pPackageIdList = new ArrayList();
+       pPackageIdList->Construct();
+
+       ret = privacy_manager_client_foreach_privacy_packages(GetPrivacyAppPackageListNCallback, pPackageIdList);
+
+       return pPackageIdList;
+}
+
+bool GetPrivacyInfoListNCallback(privacy_info_client_s* pPrivacy_info, void* user_data)
+{
+       result r = E_SUCCESS;
+       ArrayList* pList = static_cast < ArrayList* >(user_data);
+
+       String pPrivacyId = String(pPrivacy_info->privacy_id);
+       bool isEnabled = pPrivacy_info->is_enabled;
+
+       PrivacyInfo* pPrivacyInfo = new PrivacyInfo();
+       r = pPrivacyInfo->Construct(pPrivacyId, isEnabled);
+
+       pList->Add(pPrivacyInfo);
+       return true;
 }
 
 Tizen::Base::Collection::IList*
 _PrivacyManagerImpl::GetPrivacyInfoListN(const Tizen::App::PackageId& packageId) const
 {
-       return null;
+       int ret = 0;
+       ArrayList* pPrivacyIdList = null;
+       char* pAppId = null;
+
+       pPrivacyIdList = new ArrayList();
+       pPrivacyIdList->Construct();
+
+       pAppId = _StringConverter::CopyToCharArrayN(packageId);
+
+       ret = privacy_manager_client_foreach_get_privacy_info(pAppId, GetPrivacyInfoListNCallback, (void *)pPrivacyIdList);
+       delete pAppId;
+
+       return pPrivacyIdList;
 }
 
 result
 _PrivacyManagerImpl::SetAppPackagePrivacy(const Tizen::App::PackageId& packageId, const PrivacyInfo& privacyInfo)
 {
        result r = E_SUCCESS;
+       int ret = 0;
+       char* pPackageId = null;
+       char* pPrivacyId = null;
+
+       bool isEnabled = false;
+
+       pPackageId = _StringConverter::CopyToCharArrayN(packageId);
+       pPrivacyId = _StringConverter::CopyToCharArrayN(privacyInfo.GetId());
+       isEnabled = privacyInfo.IsEnabled();
 
+       ret = privacy_manager_client_set_package_privacy(pPackageId, pPrivacyId, isEnabled);
        return r;
 }
 

diff --git a/src/security/inc/FSecCert_CertTypes.h b/src/security/inc/FSecCert_CertTypes.h
index 867d077..8df6b78 100644 (file)
--- a/src/security/inc/FSecCert_CertTypes.h
+++ b/src/security/inc/FSecCert_CertTypes.h
@@ -32,7 +32,7 @@
 namespace Tizen { namespace Security { namespace Cert
 {
 
-const int _MAX_CERTIFICATE_SIZE = 8192;
+const int _MAX_CERTIFICATE_SIZE = 12288;
 const int _MAX_CERT_PRIVATE_KEY_SIZE = 3072;
 const int _MAX_CERT_PUBLIC_KEY_SIZE = 2048;
 const int _MAX_CERTIFICATE_PATH_SIZE = 128;

diff --git a/src/server/inc/FIo_IpcServer.h b/src/server/inc/FIo_IpcServer.h
index 7458d18..df1530c 100644 (file)
--- a/src/server/inc/FIo_IpcServer.h
+++ b/src/server/inc/FIo_IpcServer.h
@@ -90,29 +90,19 @@ public:
         */
        int GetClientId(void) const;
 
-       /**
-        * Returns the process id of the client which sent a request message.
-        *
-        * @return The process id of the IPC client.
-        * @remark This can be called only in a message handler.
-        */
        int GetClientProcessId(void) const;
 
-       /**
-        * Returns the package id of the client which sent a request message.
-        *
-        * @return The package id of the IPC client.
-        * @remark This can be called only in a message handler.
-        */
        Tizen::Base::String GetClientAppId(void) const;
 
+       Tizen::Base::String GetClientAppExecutableName(void) const;
+
        /**
-        * Returns the executable name of the client which sent a request message.
+        * Returns the package id of the client which sent a request message.
         *
-        * @return The executable name of the IPC client.
+        * @return The package id of the IPC client.
         * @remark This can be called only in a message handler.
         */
-       Tizen::Base::String GetClientAppExecutableName(void) const;
+       Tizen::App::PackageId GetClientPackageId(void) const;
 
        /**
         * Returns the application id of the client which sent a request message.

diff --git a/src/server/io/FIo_IpcServer.cpp b/src/server/io/FIo_IpcServer.cpp
index 1888911..24a0d53 100644 (file)
--- a/src/server/io/FIo_IpcServer.cpp
+++ b/src/server/io/FIo_IpcServer.cpp
@@ -419,6 +419,19 @@ _IpcServer::GetClientAppExecutableName(void) const
        return nullString;
 }
 
+PackageId
+_IpcServer::GetClientPackageId(void) const
+{
+       static String nullString;
+
+       if (__pCurrentClientInfo)
+       {
+               return __pCurrentClientInfo->pkgId;
+       }
+
+       return nullString;
+}
+
 AppId
 _IpcServer::GetClientApplicationId(void) const
 {