Merge "Enable disable/enable function of global apps" into tizen_3.0

diff --git a/src/pkgmgr-server.c b/src/pkgmgr-server.c
index d390f90..d69728f 100644 (file)
--- a/src/pkgmgr-server.c
+++ b/src/pkgmgr-server.c
@@ -661,14 +661,9 @@ static int __change_job_info(struct backend_job *job, uid_t uid,
        if (ret != PMINFO_R_OK)
                goto catch;
 
-       if ((job->req_type == REQUEST_TYPE_DISABLE_APP ||
-                               job->req_type == REQUEST_TYPE_ENABLE_APP) &&
-                       *is_global) {
-               ret = PMINFO_R_ERROR;
-               goto catch;
-       } else if ((job->req_type == REQUEST_TYPE_DISABLE_GLOBAL_APP_FOR_UID ||
-                               job->req_type ==
-                               REQUEST_TYPE_ENABLE_GLOBAL_APP_FOR_UID) &&
+       if ((job->req_type == REQUEST_TYPE_DISABLE_GLOBAL_APP_FOR_UID ||
+                       job->req_type ==
+                       REQUEST_TYPE_ENABLE_GLOBAL_APP_FOR_UID) &&
                        !*is_global) {
                ret = PMINFO_R_ERROR;
                goto catch;