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

Commit 531b201e authored by Ajay Panicker's avatar Ajay Panicker Committed by android-build-merger
Browse files

Merge "Remove net_bt_stack group and replace it with bluetooth" am: 7875407b am: f924c252 

am: b0db9714

Change-Id: I025c5301fecf0566d8184efce099a195fdbfc460
parents 7673c4dc b0db9714

include/private/android_filesystem_config.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -115,7 +115,6 @@ 
#define AID_NET_ADMIN     3005  /* can configure interfaces and routing tables. */

#define AID_NET_ADMIN     3005  /* can configure interfaces and routing tables. */

#define AID_NET_BW_STATS  3006  /* read bandwidth statistics */

#define AID_NET_BW_STATS  3006  /* read bandwidth statistics */

#define AID_NET_BW_ACCT   3007  /* change bandwidth statistics accounting */

#define AID_NET_BW_ACCT   3007  /* change bandwidth statistics accounting */

#define AID_NET_BT_STACK  3008  /* bluetooth: access config files */

#define AID_READPROC      3009  /* Allow /proc read access */

#define AID_READPROC      3009  /* Allow /proc read access */

#define AID_WAKELOCK      3010  /* Allow system wakelock read/write access */

#define AID_WAKELOCK      3010  /* Allow system wakelock read/write access */
@@ -221,7 +220,6 @@ static const struct android_id_info android_ids[] = { 
    { "net_admin",     AID_NET_ADMIN, },

    { "net_admin",     AID_NET_ADMIN, },

    { "net_bw_stats",  AID_NET_BW_STATS, },

    { "net_bw_stats",  AID_NET_BW_STATS, },

    { "net_bw_acct",   AID_NET_BW_ACCT, },

    { "net_bw_acct",   AID_NET_BW_ACCT, },

    { "net_bt_stack",  AID_NET_BT_STACK, },

    { "readproc",      AID_READPROC, },

    { "readproc",      AID_READPROC, },

    { "wakelock",      AID_WAKELOCK, },

    { "wakelock",      AID_WAKELOCK, },

rootdir/init.rc

+4 −4
Original line number Original line Diff line number Diff line
@@ -367,12 +367,12 @@ on post-fs-data 




    # create basic filesystem structure

    # create basic filesystem structure

    mkdir /data/misc 01771 system misc

    mkdir /data/misc 01771 system misc

    mkdir /data/misc/bluedroid 02770 bluetooth net_bt_stack

    mkdir /data/misc/bluedroid 02770 bluetooth bluetooth

    # Fix the access permissions and group ownership for 'bt_config.conf'

    # Fix the access permissions and group ownership for 'bt_config.conf'

    chmod 0660 /data/misc/bluedroid/bt_config.conf

    chmod 0660 /data/misc/bluedroid/bt_config.conf

    chown bluetooth net_bt_stack /data/misc/bluedroid/bt_config.conf

    chown bluetooth bluetooth /data/misc/bluedroid/bt_config.conf

    mkdir /data/misc/bluetooth 0770 bluetooth net_bt_stack

    mkdir /data/misc/bluetooth 0770 bluetooth bluetooth

    mkdir /data/misc/bluetooth/logs 0770 bluetooth net_bt_stack

    mkdir /data/misc/bluetooth/logs 0770 bluetooth bluetooth

    mkdir /data/misc/keystore 0700 keystore keystore

    mkdir /data/misc/keystore 0700 keystore keystore

    mkdir /data/misc/gatekeeper 0700 system system

    mkdir /data/misc/gatekeeper 0700 system system

    mkdir /data/misc/keychain 0771 system system

    mkdir /data/misc/keychain 0771 system system

rootdir/ueventd.rc

+2 −2
Original line number Original line Diff line number Diff line
@@ -40,8 +40,8 @@ subsystem adf 
/dev/android_adb          0660   adb        adb

/dev/android_adb          0660   adb        adb

/dev/android_adb_enable   0660   adb        adb

/dev/android_adb_enable   0660   adb        adb

/dev/ttyMSM0              0600   bluetooth  bluetooth

/dev/ttyMSM0              0600   bluetooth  bluetooth

/dev/uhid                 0660   system     net_bt_stack

/dev/uhid                 0660   system     bluetooth

/dev/uinput               0660   system     net_bt_stack

/dev/uinput               0660   system     bluetooth

/dev/alarm                0664   system     radio

/dev/alarm                0664   system     radio

/dev/rtc0                 0640   system     system

/dev/rtc0                 0640   system     system

/dev/tty0                 0660   root       system

/dev/tty0                 0660   root       system