Merge "Merge commit '2a7f2c72279c597c544f4c7ff9d4d6d294538b66' into remote"

This commit is contained in:
Linux Build Service Account 2017-07-22 13:56:04 -07:00 committed by Gerrit - the friendly Code Review server
commit b3c42d8d3e

View file

@ -48,6 +48,9 @@ static const struct fs_path_config android_device_files[] = {
CAP_MASK_LONG(CAP_NET_ADMIN),
"system/vendor/bin/cnd" },
{ 00755, AID_SYSTEM, AID_RADIO, (1ULL << CAP_NET_BIND_SERVICE), "vendor/bin/ims_rtp_daemon" },
{ 00755, AID_GPS, AID_GPS, (1ULL << CAP_NET_BIND_SERVICE), "system/vendor/bin/slim_daemon" },
{ 00755, AID_GPS, AID_GPS, (1ULL << CAP_NET_BIND_SERVICE), "vendor/bin/slim_daemon" },
#ifdef NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS
{ 00000, AID_ROOT, AID_ROOT, 0, "system/etc/fs_config_dirs" },
#endif