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
This commit is contained in:
Mike Lockwood 2010-09-27 11:46:54 -07:00 committed by Android Git Automerger
commit b07c78aa94

View file

@ -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, },