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

resolved conflicts for merge of 0fe9742e to jb-mr1-dev-plus-aosp

Browse source 
Change-Id: Ie7a8b642dec0f07d4c8bfd9d8f736fd66c4febe0
This commit is contained in:
Doug Zongker 2013-01-29 10:50:22 -08:00
commit 8cc97302b2
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

@ -63,6 +63,7 @@
#define AID_NFC 1027 /* nfc subsystem */ #define AID_NFC 1027 /* nfc subsystem */
#define AID_SDCARD_R 1028 /* external storage read access */ #define AID_SDCARD_R 1028 /* external storage read access */
#define AID_CLAT 1029 /* clat part of nat464 */ #define AID_CLAT 1029 /* clat part of nat464 */
#define AID_LOOP_RADIO 1030 /* loop radio devices */
#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 */
@ -138,6 +139,7 @@ static const struct android_id_info android_ids[] = {
{ "net_admin", AID_NET_ADMIN, }, { "net_admin", AID_NET_ADMIN, },
{ "net_bw_stats", AID_NET_BW_STATS, }, { "net_bw_stats", AID_NET_BW_STATS, },
{ "net_bw_acct", AID_NET_BW_ACCT, }, { "net_bw_acct", AID_NET_BW_ACCT, },
{ "loop_radio", AID_LOOP_RADIO, },
{ "misc", AID_MISC, }, { "misc", AID_MISC, },
{ "nobody", AID_NOBODY, }, { "nobody", AID_NOBODY, },
{ "clat", AID_CLAT, }, { "clat", AID_CLAT, },