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

Commit d585e683 authored by Maciej Żenczykowski's avatar Maciej Żenczykowski Committed by Automerger Merge Worker
Browse files

Merge "fix clatd permissions try 3 - this time for GSI" am: 02a6d74b am: cbb2e415 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2545790



Change-Id: I4fc50b83108dd69063007dfa2338ae62ea5db51c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 953af4ca cbb2e415

libcutils/fs_config.cpp

+4 −0
Original line number Diff line number Diff line
@@ -90,6 +90,8 @@ static const struct fs_path_config android_dirs[] = { 
    { 00755, AID_ROOT,         AID_SHELL,        0, "system/vendor" },

    { 00750, AID_ROOT,         AID_SHELL,        0, "system/xbin" },

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

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

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

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

    { 00751, AID_ROOT,         AID_SHELL,        0, "system_ext/apex/*/bin" },

    { 00751, AID_ROOT,         AID_SHELL,        0, "vendor/bin" },
@@ -198,6 +200,8 @@ static const struct fs_path_config android_files[] = { 
    // 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" },

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

    { 06755, AID_CLAT,      AID_CLAT,      0, "system_ext/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) |