diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-09-27 14:16:44 -0400 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2010-09-27 14:16:44 -0400 |
| commit | d1971c4cac37fccdccd105f78f7252582685ccd9 (patch) | |
| tree | 4a458394247e35ae81498c17d450dfa8b53b21a1 /include/private | |
| parent | 33357f5477a24cb16bd3dd692fe5ca14755ab033 (diff) | |
| parent | c29919c8d75ad218012daeda62e1e62200cad889 (diff) | |
| download | core-d1971c4cac37fccdccd105f78f7252582685ccd9.tar.gz core-d1971c4cac37fccdccd105f78f7252582685ccd9.tar.bz2 core-d1971c4cac37fccdccd105f78f7252582685ccd9.zip | |
resolved conflicts for merge of c29919c8 to gingerbread-plus-aosp
Change-Id: I860b7690c40428839e45e2c2b122661b00d47e0e
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 d531eddbf..e3dd93ec8 100644 --- a/include/private/android_filesystem_config.h +++ b/include/private/android_filesystem_config.h @@ -54,6 +54,7 @@ #define AID_USB 1018 /* USB devices */ #define AID_DRM 1019 /* DRM 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_CACHE 2001 /* cache access */ @@ -106,6 +107,7 @@ static const struct android_id_info android_ids[] = { { "vpn", AID_VPN, }, { "keystore", AID_KEYSTORE, }, { "usb", AID_USB, }, + { "gps", AID_GPS, }, { "inet", AID_INET, }, { "net_raw", AID_NET_RAW, }, { "net_admin", AID_NET_ADMIN, }, |