summaryrefslogtreecommitdiff
path: root/server/FirewallController.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'server/FirewallController.cpp')
-rw-r--r--server/FirewallController.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/server/FirewallController.cpp b/server/FirewallController.cpp
index 28be9a06..0a0f8d82 100644
--- a/server/FirewallController.cpp
+++ b/server/FirewallController.cpp
@@ -53,10 +53,6 @@ constexpr const uid_t kDefaultMaximumUid = UID_MAX - 1; // UID_MAX defined as U
// Proc file containing the uid mapping for the user namespace of the current process.
const char kUidMapProcFile[] = "/proc/self/uid_map";
-bool getBpfOwnerStatus() {
- return gCtls->trafficCtrl.getBpfEnabled();
-}
-
} // namespace
namespace android {
@@ -95,7 +91,8 @@ FirewallController::FirewallController(void) : mMaxUid(discoverMaximumValidUid(k
int FirewallController::setupIptablesHooks(void) {
int res = 0;
- mUseBpfOwnerMatch = getBpfOwnerStatus();
+ // mUseBpfOwnerMatch should be removed, but it is still depended upon by test code.
+ mUseBpfOwnerMatch = true;
if (mUseBpfOwnerMatch) {
return res;
}