ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolved conflicts for merge of c29919c8 to gingerbread-plus-aosp

Browse source 
Change-Id: I860b7690c40428839e45e2c2b122661b00d47e0e
This commit is contained in:
Mike Lockwood 2010-09-27 14:16:44 -04:00
commit d1971c4cac
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/private/android_filesystem_config.h
View file

@ -54,6 +54,7 @@
#define AID_USB 1018 /* USB devices */ #define AID_USB 1018 /* USB devices */
#define AID_DRM 1019 /* DRM server */ #define AID_DRM 1019 /* DRM server */
#define AID_DRMIO 1020 /* DRM IO server */ #define AID_DRMIO 1020 /* DRM IO server */
#define AID_GPS 1021 /* GPS daemon */
#define AID_SHELL 2000 /* adb and debug shell user */ #define AID_SHELL 2000 /* adb and debug shell user */
#define AID_CACHE 2001 /* cache access */ #define AID_CACHE 2001 /* cache access */
@ -106,6 +107,7 @@ static const struct android_id_info android_ids[] = {
{ "vpn", AID_VPN, }, { "vpn", AID_VPN, },
{ "keystore", AID_KEYSTORE, }, { "keystore", AID_KEYSTORE, },
{ "usb", AID_USB, }, { "usb", AID_USB, },
{ "gps", AID_GPS, },
{ "inet", AID_INET, }, { "inet", AID_INET, },
{ "net_raw", AID_NET_RAW, }, { "net_raw", AID_NET_RAW, },
{ "net_admin", AID_NET_ADMIN, }, { "net_admin", AID_NET_ADMIN, },