diff options
| author | Doug Zongker <dougz@google.com> | 2013-01-29 10:50:22 -0800 |
|---|---|---|
| committer | Doug Zongker <dougz@google.com> | 2013-01-29 10:50:22 -0800 |
| commit | 8cc97302b2cc42d70af3c6d84a6a46984a09fe24 (patch) | |
| tree | f0a5e4dd168a651bc66c7adafd5f3cfe078f5402 /include/private | |
| parent | db9697b3b059469153e81bf9e8844fb8e23149ea (diff) | |
| parent | 0fe9742e385f7641a1f6272699349510ac57da9d (diff) | |
| download | system_core-8cc97302b2cc42d70af3c6d84a6a46984a09fe24.zip system_core-8cc97302b2cc42d70af3c6d84a6a46984a09fe24.tar.gz system_core-8cc97302b2cc42d70af3c6d84a6a46984a09fe24.tar.bz2 | |
resolved conflicts for merge of 0fe9742e to jb-mr1-dev-plus-aosp
Change-Id: Ie7a8b642dec0f07d4c8bfd9d8f736fd66c4febe0
Diffstat (limited to 'include/private')
| -rw-r--r-- | include/private/android_filesystem_config.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h index f90af81..746bec3 100644 --- a/include/private/android_filesystem_config.h +++ b/include/private/android_filesystem_config.h @@ -63,6 +63,7 @@ #define AID_NFC 1027 /* nfc subsystem */ #define AID_SDCARD_R 1028 /* external storage read access */ #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_CACHE 2001 /* cache access */ @@ -138,6 +139,7 @@ static const struct android_id_info android_ids[] = { { "net_admin", AID_NET_ADMIN, }, { "net_bw_stats", AID_NET_BW_STATS, }, { "net_bw_acct", AID_NET_BW_ACCT, }, + { "loop_radio", AID_LOOP_RADIO, }, { "misc", AID_MISC, }, { "nobody", AID_NOBODY, }, { "clat", AID_CLAT, }, |