diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-09-27 11:46:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-27 11:46:54 -0700 |
| commit | b07c78aa942a09fb1a3ae4eecaca793be9c431d1 (patch) | |
| tree | 8ff7858a67a601e0e163a5152e0d5996c1d06460 /include/private | |
| parent | 0715f91223b2f7a91ea08bfa95998d846e7977cf (diff) | |
| parent | d1971c4cac37fccdccd105f78f7252582685ccd9 (diff) | |
| download | system_core-b07c78aa942a09fb1a3ae4eecaca793be9c431d1.tar.gz system_core-b07c78aa942a09fb1a3ae4eecaca793be9c431d1.tar.bz2 system_core-b07c78aa942a09fb1a3ae4eecaca793be9c431d1.zip | |
am d1971c4c: resolved conflicts for merge of c29919c8 to gingerbread-plus-aosp
Merge commit 'd1971c4cac37fccdccd105f78f7252582685ccd9'
* commit 'd1971c4cac37fccdccd105f78f7252582685ccd9':
Add AID_GPS user ID for GPS daemon
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 2cbe7673..1751e152 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, }, |