Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1971c4c authored by Mike Lockwood's avatar Mike Lockwood
Browse files

resolved conflicts for merge of c29919c8 to gingerbread-plus-aosp 

Change-Id: I860b7690c40428839e45e2c2b122661b00d47e0e
parents 33357f54 c29919c8

include/private/android_filesystem_config.h

+2 −0
Original line number Diff line number Diff line
@@ -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, },