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

Commit 05eb3731 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9939584 from b7ba156b to udc-release 

Change-Id: I4313a2b54b1211b9e7c2b1391ab9685784a4ae9f
parents 620453df b7ba156b

fs_mgr/libsnapshot/snapuserd/snapuserd_daemon.cpp

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ bool Daemon::StartServerForUserspaceSnapshots(int arg_start, int argc, char** ar 
    for (int i = arg_start; i < argc; i++) {

        auto parts = android::base::Split(argv[i], ",");

        if (parts.size() != 4) {

            LOG(ERROR) << "Malformed message, expected three sub-arguments.";

            LOG(ERROR) << "Malformed message, expected four sub-arguments.";

            return false;

        }

        auto handler = user_server_.AddHandler(parts[0], parts[1], parts[2], parts[3]);

fs_mgr/tools/dmctl.cpp

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ static int Usage(void) { 
    std::cerr << "  getpath <dm-name>" << std::endl;

    std::cerr << "  getuuid <dm-name>" << std::endl;

    std::cerr << "  info <dm-name>" << std::endl;

    std::cerr << "  replace <dm-name> <targets...>" << std::endl;

    std::cerr << "  status <dm-name>" << std::endl;

    std::cerr << "  resume <dm-name>" << std::endl;

    std::cerr << "  suspend <dm-name>" << std::endl;

healthd/healthd.rc

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
service healthd /system/bin/healthd

    class hal

    critical

    group root system wakelock

libcutils/fs_config.cpp

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ static const struct fs_path_config android_dirs[] = { 
    { 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" },

    { 00750, AID_ROOT,         AID_SYSTEM,       0, "system/apex/com.android.tethering.inprocess/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" },
@@ -196,6 +197,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" },

    { 06755, AID_CLAT,      AID_CLAT,      0, "system/apex/com.android.tethering.inprocess/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) |

libprocessgroup/task_profiles_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ bool IsCgroupV2Mounted() { 
    }

    struct mntent* mnt;

    while ((mnt = getmntent(mnts.get()))) {

        if (strcmp(mnt->mnt_fsname, "cgroup2") == 0) {

        if (strcmp(mnt->mnt_type, "cgroup2") == 0) {

            return true;

        }

    }