Fix bug in using db_prepare. 99/34799/2 accepted/tizen/mobile/20150313.083944 accepted/tizen/tv/20150302.010503 accepted/tizen/tv/20150313.083830 accepted/tizen/wearable/20150313.083856 submit/tizen/20150304.022845 submit/tizen_mobile/20150313.022842 submit/tizen_tv/20150227.073215 submit/tizen_tv/20150228.021455 submit/tizen_tv/20150313.022842 submit/tizen_wearable/20150313.022842
authorJiwoong Im <jiwoong.im@samsung.com>
Fri, 30 Jan 2015 07:11:45 +0000 (16:11 +0900)
committerJiwoong Im <jiwoong.im@samsung.com>
Tue, 3 Feb 2015 02:12:09 +0000 (18:12 -0800)
In GLOBAL_USER apis, db_prepare should be changed to db_prepare_globalro to prepare GLOBAL_USER's db .

Change-Id: Ic8b55768254537ae97c101c336415f473f5cdcba
Signed-off-by: Jiwoong Im <jiwoong.im@samsung.com>
src/ail_desktop.c
src/ail_package.c

index 1e666cc..aeb06ee 100755 (executable)
@@ -1134,9 +1134,13 @@ static ail_error_e _load_desktop_info(desktop_info_s* info, uid_t uid)
        do {
                ret = db_open(DB_OPEN_RO, uid);
                if (ret < 0) break;
-//is_admin
-               ret = db_prepare(query, &stmt);
-               //ret = db_prepare_globalro(query, &stmt);
+
+               if (uid != GLOBAL_USER) {
+                       ret = db_prepare(query, &stmt);
+               } else {
+                       ret = db_prepare_globalro(query, &stmt);
+               }
+
                if (ret < 0) break;
 
                ret = db_step(stmt);
index 2b30f5a..d8d7dcc 100755 (executable)
@@ -330,7 +330,7 @@ EXPORT_API ail_error_e ail_get_appinfo(const char *appid, ail_appinfo_h *ai)
                ret = db_open(DB_OPEN_RO, GLOBAL_USER);
                if (ret < 0) break;
 //is_admin
-               ret = db_prepare(query, &stmt);
+               ret = db_prepare_globalro(query, &stmt);
                if (ret < 0) break;
 //             ret = db_prepare(query, &stmt);
 //             if (ret < 0) break;
@@ -483,13 +483,13 @@ char *appinfo_get_localname(const char *package, char *locale, uid_t uid)
        char *str = NULL;
        char *localname;
        char query[512];
-       
+
        snprintf(query, sizeof(query), QUERY_GET_LOCALNAME, package, locale);
 
-//     _D("Query = %s",query);
-//is_admin
-       retv_if (db_prepare(query, &stmt) < 0, NULL);
-       //retv_if (db_prepare(query, &stmt) < 0, NULL);
+       if (uid != GLOBAL_USER)
+               retv_if (db_prepare(query, &stmt) < 0, NULL);
+       else
+               retv_if (db_prepare_globalro(query, &stmt) < 0, NULL);
 
        do {
                if (db_step(stmt) < 0)