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

Commit d99d1445 authored by San Mehat's avatar San Mehat
Browse files

resolved conflicts w/ b415390e merge

parents 408bf61b b415390e

include/private/android_filesystem_config.h

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#define AID_MEDIA         1013  /* mediaserver process */

#define AID_DHCP          1014  /* dhcp client */

#define AID_SDCARD_RW     1015  /* external storage write access */

#define AID_VPN           1016  /* vpn system */



#define AID_SHELL         2000  /* adb and debug shell user */

#define AID_CACHE         2001  /* cache access */
@@ -95,6 +96,7 @@ static struct android_id_info android_ids[] = { 
    { "net_bt_admin", AID_NET_BT_ADMIN, },

    { "net_bt",    AID_NET_BT, },

    { "sdcard_rw", AID_SDCARD_RW, },

    { "vpn",       AID_VPN, },

    { "inet",      AID_INET, }, 

    { "net_raw",   AID_NET_RAW, },

    { "misc",      AID_MISC, },

init/devices.c

+1 −1
Original line number Diff line number Diff line
@@ -131,9 +131,9 @@ static struct perms_ devperms[] = { 
    { "/dev/qmi0",          0640,   AID_RADIO,      AID_RADIO,      0 },

    { "/dev/qmi1",          0640,   AID_RADIO,      AID_RADIO,      0 },

    { "/dev/qmi2",          0640,   AID_RADIO,      AID_RADIO,      0 },



        /* CDMA radio interface MUX */

    { "/dev/ts0710mux",     0640,   AID_RADIO,      AID_RADIO,      1 },

    { "/dev/tun",           0640,   AID_VPN  ,      AID_VPN,        0 },

    { NULL, 0, 0, 0, 0 },

};