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

Commit 620453df authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9921839 from c7e85ebc to udc-release 

Change-Id: Ic9250bfe87c12461f4839bf89dc17e5e7d4e4492
parents 008b0338 c7e85ebc

init/init_test.cpp

+4 −0
Original line number Diff line number Diff line
@@ -204,6 +204,10 @@ TEST(init, StartConsole) { 
        GTEST_SKIP() << "Must run on userdebug/eng builds. b/262090304";

        return;

    }

    if (getuid() != 0) {

        GTEST_SKIP() << "Must be run as root.";

        return;

    }

    std::string init_script = R"init(

service console /system/bin/sh

    class core

libcutils/fs_config.cpp

+2 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ static const struct fs_path_config android_dirs[] = { 
    { 00751, AID_ROOT,         AID_SHELL,        0, "product/apex/*/bin" },

    { 00777, AID_ROOT,         AID_ROOT,         0, "sdcard" },

    { 00751, AID_ROOT,         AID_SDCARD_R,     0, "storage" },

    { 00750, AID_ROOT,         AID_SYSTEM,       0, "system/apex/com.android.tethering/bin/for-system" },

    { 00751, AID_ROOT,         AID_SHELL,        0, "system/bin" },

    { 00755, AID_ROOT,         AID_ROOT,         0, "system/etc/ppp" },

    { 00755, AID_ROOT,         AID_SHELL,        0, "system/vendor" },
@@ -194,6 +195,7 @@ static const struct fs_path_config android_files[] = { 


    // the following files have enhanced capabilities and ARE included

    // in user builds.

    { 06755, AID_CLAT,      AID_CLAT,      0, "system/apex/com.android.tethering/bin/for-system/clatd" },

    { 00700, AID_SYSTEM,    AID_SHELL,     CAP_MASK_LONG(CAP_BLOCK_SUSPEND),

                                              "system/bin/inputflinger" },

    { 00750, AID_ROOT,      AID_SHELL,     CAP_MASK_LONG(CAP_SETUID) |