MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Define gps user and group id's for Android and LE."

Browse source
This commit is contained in:
Linux Build Service Account 2018-03-07 05:32:27 -08:00 committed by Gerrit - the friendly Code Review server
commit 1edbe5d597
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pla/android/loc_pla.h
View file

@ -41,6 +41,10 @@ extern "C" {
#include <cutils/properties.h> #include <cutils/properties.h>
#include <cutils/threads.h> #include <cutils/threads.h>
#include <cutils/sched_policy.h> #include <cutils/sched_policy.h>
#include <private/android_filesystem_config.h>
#define UID_GPS (AID_GPS)
#define GID_GPS (AID_GPS)
#define LOC_PATH_GPS_CONF_STR "/vendor/etc/gps.conf" #define LOC_PATH_GPS_CONF_STR "/vendor/etc/gps.conf"
#define LOC_PATH_IZAT_CONF_STR "/vendor/etc/izat.conf" #define LOC_PATH_IZAT_CONF_STR "/vendor/etc/izat.conf"

3
pla/oe/loc_pla.h
View file

@ -51,6 +51,9 @@ extern "C" {
#define strlcpy strncpy #define strlcpy strncpy
#endif #endif
#define UID_GPS (1021)
#define GID_GPS (1021)
#define LOC_PATH_GPS_CONF_STR "/etc/gps.conf" #define LOC_PATH_GPS_CONF_STR "/etc/gps.conf"
#define LOC_PATH_IZAT_CONF_STR "/etc/izat.conf" #define LOC_PATH_IZAT_CONF_STR "/etc/izat.conf"
#define LOC_PATH_FLP_CONF_STR "/etc/flp.conf" #define LOC_PATH_FLP_CONF_STR "/etc/flp.conf"

13
utils/loc_cfg.cpp
View file

@ -37,7 +37,7 @@
#include <ctype.h> #include <ctype.h>
#include <unistd.h> #include <unistd.h>
#include <time.h> #include <time.h>
#include <pwd.h> #include <grp.h>
#include <errno.h> #include <errno.h>
#include <loc_cfg.h> #include <loc_cfg.h>
#include <loc_pla.h> #include <loc_pla.h>
@ -826,18 +826,17 @@ int loc_read_process_conf(const char* conf_file_name, uint32_t * process_count_p
child_proc[j].num_groups = 0; child_proc[j].num_groups = 0;
ngroups = loc_util_split_string(conf.group_list, split_strings, MAX_NUM_STRINGS, ' '); ngroups = loc_util_split_string(conf.group_list, split_strings, MAX_NUM_STRINGS, ' ');
#ifdef __ANDROID__
for(i=0; i<ngroups; i++) { for(i=0; i<ngroups; i++) {
struct passwd* pwd = getpwnam(split_strings[i]); struct group* grp = getgrnam(split_strings[i]);
if (pwd) { if (grp) {
child_proc[j].group_list[i] = pwd->pw_gid; child_proc[j].group_list[i] = grp->gr_gid;
child_proc[j].num_groups++; child_proc[j].num_groups++;
LOC_LOGD("%s:%d]:Group %s = %d matches child_group: %d\n", LOC_LOGD("%s:%d]:Group %s = %d matches child_group: %d\n",
__func__, __LINE__, split_strings[i], __func__, __LINE__, split_strings[i],
pwd->pw_gid,child_proc[j].group_list[i]); grp->gr_gid,child_proc[j].group_list[i]);
} }
} }
#endif
nstrings = loc_util_split_string(conf.platform_list, split_strings, MAX_NUM_STRINGS, ' '); nstrings = loc_util_split_string(conf.platform_list, split_strings, MAX_NUM_STRINGS, ' ');
if(strcmp("all", split_strings[0]) == 0) { if(strcmp("all", split_strings[0]) == 0) {
if (nstrings == 1 || (nstrings == 2 && (strcmp("exclude", split_strings[1]) == 0))) { if (nstrings == 1 || (nstrings == 2 && (strcmp("exclude", split_strings[1]) == 0))) {