| commit | 5d7f68992ae37bf00eeb51dd543c796e3e79550e | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Fri Jun 14 20:34:42 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 14 20:34:42 2024 +0000 |
| tree | 9d6d4c3f9322c6794928f07e9b103d6621a382ef | |
| parent | 6f676e97d642cd21f6b16d1300f58345a0bde8ab [diff] | |
| parent | b94b68b9a8e38669e610d883aee0f4b71f9d91ba [diff] |
NetBpfLoad: remove isGSI() check am: 4a0838c2ce am: b94b68b9a8 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3134093 Change-Id: I0b85ac1d33066310400b9294b727b3270530526b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/netbpfload/NetBpfLoad.cpp b/netbpfload/NetBpfLoad.cpp index b9976e0..a247bda 100644 --- a/netbpfload/NetBpfLoad.cpp +++ b/netbpfload/NetBpfLoad.cpp
@@ -224,11 +224,6 @@ return 0; } -static bool isGSI() { - // From //system/gsid/libgsi.cpp IsGsiRunning() - return !access("/metadata/gsi/dsu/booted", F_OK); -} - static bool hasGSM() { static string ph = base::GetProperty("gsm.current.phone-type", ""); static bool gsm = (ph != ""); @@ -351,7 +346,7 @@ #undef REQUIRE - if (bad && !isGSI()) { + if (bad) { ALOGE("Unsupported kernel version (%07x).", kernelVersion()); } }