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

Commit 4daec2d2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "flattened apex: fix clatd mode also for inprocess tethering" am:... 

Merge "flattened apex: fix clatd mode also for inprocess tethering" am: 6c0ff3bd am: 27307dda am: 1c428f96

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



Change-Id: Iaae7ccf3c3dc1466f5f5acad3517beeb06ea9340
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c7e85ebc 1c428f96

libcutils/fs_config.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -84,6 +84,7 @@ static const struct fs_path_config android_dirs[] = { 
    { 00777, AID_ROOT,         AID_ROOT,         0, "sdcard" },

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

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

    { 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/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" },

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

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

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

    { 00755, AID_ROOT,         AID_SHELL,        0, "system/vendor" },

    { 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

    // the following files have enhanced capabilities and ARE included

    // in user builds.

    // 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/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),

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

                                              "system/bin/inputflinger" },

                                              "system/bin/inputflinger" },

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

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