android-13.0.0_r82 patches

This commit is contained in:
Ziyang Zhou
2023-10-05 22:23:01 +08:00
parent c4d3a1bee4
commit b3fa25049b
21 changed files with 938 additions and 0 deletions

View File

@@ -0,0 +1,50 @@
From 9c5a41802bfe028957b4a2578fc4ee5117b96fc8 Mon Sep 17 00:00:00 2001
From: Ziyang Zhou <ziyang.zhou@outlook.com>
Date: Sat, 31 Jul 2021 06:14:33 +0000
Subject: [PATCH 1/3] fix booting
---
server/BandwidthController.cpp | 1 +
server/Controllers.cpp | 1 -
server/IptablesRestoreController.cpp | 1 +
3 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/server/BandwidthController.cpp b/server/BandwidthController.cpp
index 8dba75a5e..88305b05d 100644
--- a/server/BandwidthController.cpp
+++ b/server/BandwidthController.cpp
@@ -542,6 +542,7 @@ int BandwidthController::updateQuota(const std::string& quotaName, int64_t bytes
if (!isOk(file)) {
int res = errno;
ALOGE("Updating quota %s failed (%s)", quotaName.c_str(), toString(file).c_str());
+ res = 0; // HACKED
return -res;
}
// TODO: should we propagate this error?
diff --git a/server/Controllers.cpp b/server/Controllers.cpp
index 00ee186d6..c07f1b817 100644
--- a/server/Controllers.cpp
+++ b/server/Controllers.cpp
@@ -284,7 +284,6 @@ void Controllers::init() {
// As such simply exit netd. This may crash loop the system, but by failing
// to bootup we will trigger rollback and thus this offers us protection against
// a mainline update breaking things.
- exit(1);
}
gLog.info("Enabling bandwidth control: %" PRId64 "us", s.getTimeAndResetUs());
diff --git a/server/IptablesRestoreController.cpp b/server/IptablesRestoreController.cpp
index f7ba20086..2cc5899fc 100644
--- a/server/IptablesRestoreController.cpp
+++ b/server/IptablesRestoreController.cpp
@@ -345,6 +345,7 @@ int IptablesRestoreController::execute(const IptablesTarget target, const std::s
if (target == V6 || target == V4V6) {
res |= sendCommand(IP6TABLES_PROCESS, command, output);
}
+ res = 0; // ignore iptables error
return res;
}
--
2.34.1

View File

@@ -0,0 +1,24 @@
From 05d4164cd92e3108e632637e7575b03f34d11459 Mon Sep 17 00:00:00 2001
From: Ziyang Zhou <ziyang.zhou@outlook.com>
Date: Sun, 14 Aug 2022 11:53:19 +0800
Subject: [PATCH 2/3] ignore bpf error
---
server/main.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/server/main.cpp b/server/main.cpp
index 0e81d4e5c..ed4dc4931 100644
--- a/server/main.cpp
+++ b/server/main.cpp
@@ -134,7 +134,6 @@ int main() {
if (libnetd_updatable_init(cg2_path.c_str())) {
ALOGE("libnetd_updatable_init failed");
- exit(1);
}
gLog.info("libnetd_updatable_init success");
--
2.34.1

View File

@@ -0,0 +1,28 @@
From 51c7b5d27285f3a8e854ff2117ab9d54e3f405f4 Mon Sep 17 00:00:00 2001
From: Ziyang Zhou <ziyang.zhou@outlook.com>
Date: Sun, 14 Aug 2022 11:57:11 +0800
Subject: [PATCH 3/3] ignote getTetherStats error
---
server/TetherController.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/server/TetherController.cpp b/server/TetherController.cpp
index 791935746..826ef4338 100644
--- a/server/TetherController.cpp
+++ b/server/TetherController.cpp
@@ -917,9 +917,11 @@ StatusOr<TetherController::TetherStatsList> TetherController::getTetherStats() {
}
if (int ret = addForwardChainStats(statsList, statsString, parsedIptablesOutput)) {
+#if 0
return statusFromErrno(-ret, StringPrintf("failed to parse %s tether stats:\n%s",
target == V4 ? "IPv4": "IPv6",
parsedIptablesOutput.c_str()));
+#endif
}
}
--
2.34.1