joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "drop support for V gsi on pixel 5 R base kernel" am: 818d4480e8 am: ef010d5b74

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2575790

Change-Id: I8d197549549119074c1fcfaee0a0373ef86885cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-05-03 20:43:36 +00:00 • committed by Automerger Merge Worker
commit cd9ecb948e
1 changed files with 0 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
service/jni/com_android_server_connectivity_ClatCoordinator.cpp
View file

@ -90,11 +90,6 @@ static void verifyPerms(const char * const path,
#undef ALOGF
bool isGsiImage() {
// this implementation matches 2 other places in the codebase (same function name too)
return !access("/system/system_ext/etc/init/init.gsi.rc", F_OK);
}
static const char* kClatdDir = "/apex/com.android.tethering/bin/for-system";
static const char* kClatdBin = "/apex/com.android.tethering/bin/for-system/clatd";
@ -135,14 +130,6 @@ static void verifyClatPerms() {
#undef V2
// HACK: Some old vendor kernels lack ~5.10 backport of 'bpffs selinux genfscon' support.
// This is *NOT* supported, but let's allow, at least for now, U+ GSI to boot on them.
// (without this hack pixel5 R vendor + U gsi breaks)
if (isGsiImage() && !bpf::isAtLeastKernelVersion(5, 10, 0)) {
ALOGE("GSI with *BAD* pre-5.10 kernel lacking bpffs selinux genfscon support.");
return;
}
if (fatal) abort();
}