From d38550646590a3f69f03685d935eb1290fb1d789 Mon Sep 17 00:00:00 2001 From: Satoshi Niwa Date: Wed, 12 Apr 2023 14:29:55 +0900 Subject: [PATCH] flattened apex: fix clatd mode also for inprocess tethering This is a follow-on CL for aosp/2528043 /system/apex/com.android.tethering.inprocess/bin/for-system/clatd is bind mounted as /apex/com.android.tethering/bin/for-system/clatd when using inprocess tethering. Bug: 273821347 Test: `ls -l /apex/com.android.tethering/bin/for-system/clatd` on bertha Test: Also see aosp/2528043 for how it is tested Change-Id: Ia20165663e4ff6d9266fe601d25395816792a3f7 --- libcutils/fs_config.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp index 295f4dada..e46774ba4 100644 --- a/libcutils/fs_config.cpp +++ b/libcutils/fs_config.cpp @@ -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) |