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

Commit 6469fa2a authored by Tim Murray's avatar Tim Murray
Browse files

resolve merge conflicts of 3a29e344 to nyc-mr1-dev-plus-aosp 

Change-Id: I4edd53094a98fcb3cd3e1b063122d13f80d36d3c
parents aa32e374 3a29e344

libcutils/fs_config.c

+3 −0
Original line number Diff line number Diff line
@@ -142,6 +142,9 @@ static const struct fs_path_config android_files[] = { 
    { 00750, AID_ROOT,      AID_SHELL,     CAP_MASK_LONG(CAP_SETUID) | CAP_MASK_LONG(CAP_SETGID), "system/bin/run-as" },

    { 00700, AID_SYSTEM,    AID_SHELL,     CAP_MASK_LONG(CAP_BLOCK_SUSPEND), "system/bin/inputflinger" },



    /* Support FIFO scheduling mode in SurfaceFlinger. */

    { 00755, AID_SYSTEM,    AID_GRAPHICS,     CAP_MASK_LONG(CAP_SYS_NICE), "system/bin/surfaceflinger" },



    { 00750, AID_ROOT,      AID_ROOT,      0, "system/bin/uncrypt" },

    { 00750, AID_ROOT,      AID_ROOT,      0, "system/bin/install-recovery.sh" },

    { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/*" },

rootdir/init.rc

+4 −2
Original line number Diff line number Diff line
@@ -135,16 +135,18 @@ on init 
    chown system system /dev/cpuctl

    chown system system /dev/cpuctl/tasks

    chmod 0666 /dev/cpuctl/tasks

    write /dev/cpuctl/cpu.rt_runtime_us 800000

    write /dev/cpuctl/cpu.shares 1024

    write /dev/cpuctl/cpu.rt_period_us 1000000

    write /dev/cpuctl/cpu.rt_runtime_us 950000



    mkdir /dev/cpuctl/bg_non_interactive

    chown system system /dev/cpuctl/bg_non_interactive/tasks

    chmod 0666 /dev/cpuctl/bg_non_interactive/tasks

    # 5.0 %

    write /dev/cpuctl/bg_non_interactive/cpu.shares 52

    write /dev/cpuctl/bg_non_interactive/cpu.rt_runtime_us 700000

    write /dev/cpuctl/bg_non_interactive/cpu.rt_period_us 1000000

    # active FIFO threads will never be in BG

    write /dev/cpuctl/bg_non_interactive/cpu.rt_runtime_us 10000



    # sets up initial cpusets for ActivityManager

    mkdir /dev/cpuset