From: Sangyoon Jang Date: Tue, 7 Jul 2020 07:17:46 +0000 (+0900) Subject: Remove multi uninstall APIs X-Git-Tag: accepted/tizen/unified/20200724.124228~2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fapi%2Fpackage-manager.git;a=commitdiff_plain;h=27ceadd072708b74f09586e2856cab199f1c0c6d Remove multi uninstall APIs This feature is not ready yet. Change-Id: I5033fe2a1dbcee414afd4e5125d2beef7bd45f66 Signed-off-by: Sangyoon Jang --- diff --git a/include/package_manager.h b/include/package_manager.h index e5f5ce0..f8eff57 100644 --- a/include/package_manager.h +++ b/include/package_manager.h @@ -1004,7 +1004,6 @@ int package_manager_request_install_with_cb(package_manager_request_h request, * @retval #PACKAGE_MANAGER_ERROR_OUT_OF_MEMORY Out of memory * @retval #PACKAGE_MANAGER_ERROR_IO_ERROR I/O error * @retval #PACKAGE_MANAGER_ERROR_SYSTEM_ERROR Severe system error - * @see package_manager_request_uninstall_packages() */ int package_manager_request_install_packages(package_manager_request_h request, const char **paths, @@ -1091,65 +1090,6 @@ int package_manager_request_uninstall_with_cb(package_manager_request_h request, /** * @platform - * @brief Uninstalls the packages with the given names, asynchronously. - * @since_tizen 6.0 - * @privlevel platform - * @privilege %http://tizen.org/privilege/packagemanager.admin - * @param[in] request The request handle - * @param[in] names The array of names of the package to be uninstalled - * @param[in] n_names The number of names in array - * @param[out] id The ID of the request to the package manager - * @return @c 0 on success, - * otherwise a negative error value - * @retval #PACKAGE_MANAGER_ERROR_NONE Successful - * @retval #PACKAGE_MANAGER_ERROR_PERMISSION_DENIED Permission denied - * @retval #PACKAGE_MANAGER_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE No such package - * @retval #PACKAGE_MANAGER_ERROR_OUT_OF_MEMORY Out of memory - * @retval #PACKAGE_MANAGER_ERROR_IO_ERROR I/O error - * @retval #PACKAGE_MANAGER_ERROR_SYSTEM_ERROR Severe system error - * @see package_manager_request_uninstall_packages() - */ -int package_manager_request_uninstall_packages(package_manager_request_h request, - const char **names, - int n_names, - int *id); - -/** - * @platform - * @brief Uninstalls the packages with the given names, asynchronously. - * @details The progress of the request is asynchronously received by the callback function. - * The @a callback is the individual callback only called for the current API call. - * The @a callback is the only callback called, even if another callback was set for this request - * with package_manager_request_set_event_cb(). - * @since_tizen 6.0 - * @privlevel platform - * @privilege %http://tizen.org/privilege/packagemanager.admin - * @param[in] request The request handle - * @param[in] names The array of names of the package to be uninstalled - * @param[in] n_names The number of names in array - * @param[in] callback The callback function to be invoked - * @param[in] user_data The user data to be passed to the callback function - * @param[out] id The ID of the request to the package manager - * @return @c 0 on success, - * otherwise a negative error value - * @retval #PACKAGE_MANAGER_ERROR_NONE Successful - * @retval #PACKAGE_MANAGER_ERROR_PERMISSION_DENIED Permission denied - * @retval #PACKAGE_MANAGER_ERROR_INVALID_PARAMETER Invalid parameter - * @retval #PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE No such package - * @retval #PACKAGE_MANAGER_ERROR_OUT_OF_MEMORY Out of memory - * @retval #PACKAGE_MANAGER_ERROR_IO_ERROR I/O error - * @retval #PACKAGE_MANAGER_ERROR_SYSTEM_ERROR Severe system error - */ -int package_manager_request_uninstall_packages_with_cb(package_manager_request_h request, - const char **names, - int n_names, - package_manager_request_event_cb callback, - void *user_data, - int *id); - -/** - * @platform * @brief Moves the package from SD card to the internal memory and vice versa, asynchronously. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * @privlevel platform diff --git a/include/package_manager_extension.h b/include/package_manager_extension.h index 00eb521..193adf3 100644 --- a/include/package_manager_extension.h +++ b/include/package_manager_extension.h @@ -97,7 +97,6 @@ int package_manager_request_mount_install_with_cb(package_manager_request_h requ * @retval #PACKAGE_MANAGER_ERROR_OUT_OF_MEMORY Out of memory * @retval #PACKAGE_MANAGER_ERROR_IO_ERROR I/O error * @retval #PACKAGE_MANAGER_ERROR_SYSTEM_ERROR Severe system error - * @see package_manager_request_uninstall_packages() */ int package_manager_request_mount_install_packages(package_manager_request_h request, const char **paths, diff --git a/src/package_manager.c b/src/package_manager.c index aa8fec4..b1d5034 100644 --- a/src/package_manager.c +++ b/src/package_manager.c @@ -826,62 +826,6 @@ static int __request_uninstall(package_manager_request_h request, return PACKAGE_MANAGER_ERROR_NONE; } -static int __request_uninstall_packages(package_manager_request_h request, - const char **names, int n_names, pkgmgr_handler event_cb, - int *id) -{ - int retval; - retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_ADMIN); - if (retval != PACKAGE_MANAGER_ERROR_NONE) - return retval; - - if (package_manager_client_validate_handle(request)) - return package_manager_error( - PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, - __FUNCTION__, NULL); - - if (names == NULL || n_names < 1) - return package_manager_error( - PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, - __FUNCTION__, NULL); - int request_id = 0; - request_id = pkgmgr_client_uninstall_packages(request->pc, names, - n_names, event_cb ? event_cb : request_event_handler, - request); - - if (request_id == PKGMGR_R_EINVAL) - return package_manager_error( - PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, - __FUNCTION__, NULL); - else if (request_id == PKGMGR_R_ENOPKG) - return package_manager_error( - PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, - __FUNCTION__, NULL); - else if (request_id == PKGMGR_R_ENOMEM) - return package_manager_error( - PACKAGE_MANAGER_ERROR_OUT_OF_MEMORY, - __FUNCTION__, NULL); - else if (request_id == PKGMGR_R_EIO) - return package_manager_error( - PACKAGE_MANAGER_ERROR_IO_ERROR, - __FUNCTION__, NULL); - else if (request_id == PKGMGR_R_EPRIV) - return package_manager_error( - PACKAGE_MANAGER_ERROR_PERMISSION_DENIED, - __FUNCTION__, NULL); - else if (request_id == PKGMGR_R_ESYSTEM || - request_id == PKGMGR_R_ECOMM || - request_id == PKGMGR_R_ERROR) - return package_manager_error( - PACKAGE_MANAGER_ERROR_SYSTEM_ERROR, - __FUNCTION__, NULL); - - if (id) - *id = request_id; - - return PACKAGE_MANAGER_ERROR_NONE; -} - static int __request_move(package_manager_request_h request, const char *name, package_manager_move_type_e move_type, pkgmgr_handler event_cb, int *id) @@ -1110,42 +1054,6 @@ API int package_manager_request_uninstall_with_cb(package_manager_request_h requ return ret; } -API int package_manager_request_uninstall_packages( - package_manager_request_h request, const char **names, - int n_names, int *id) -{ - return __request_uninstall_packages(request, names, n_names, NULL, id); -} - -API int package_manager_request_uninstall_packages_with_cb( - package_manager_request_h request, const char **names, - int n_names, package_manager_request_event_cb callback, - void *user_data, int *id) -{ - int ret; - int req_id = 0; - - if (request->request_cb_table == NULL) - __initialize_request_cb_table(request); - - ret = __request_uninstall_packages(request, names, n_names, - internal_request_callback, &req_id); - - if (req_id > 0) { - ret = __insert_request_cb_info(request, req_id, callback, - user_data); - if (ret < 0) - return package_manager_error( - PACKAGE_MANAGER_ERROR_OUT_OF_MEMORY, - __FUNCTION__, - "failed to create request cb info"); - if (id) - *id = req_id; - } - - return ret; -} - API int package_manager_request_move(package_manager_request_h request, const char *name, package_manager_move_type_e move_type) {