commit 3d7c966c00d1879009ecb2c5b8ce8ba6236fd7a1
author Maciej Żenczykowski <maze@google.com> Tue Feb 11 17:11:26 2020 -0800
committer Maciej Żenczykowski <maze@google.com> Wed Feb 12 02:00:34 2020 +0000
tree 6420ad328d077b306e46498a633f693516449aa9
parent 045306e2260506c7978a6a93e279c0ba993536c9

simplify: BpfLevel -> BpfEnabled where appropriate

bpf::BpfLevel getBpfLevel() --> bool getBpfEnabled()
bpf::BpfLevel mBpfLevel --> bool mBpfEnabled

Test: build, atest
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Idb5f9ed10e123a5653047b9d31c7245b9cb8a46e

server/FirewallController.cpp

diff --git a/server/FirewallController.cpp b/server/FirewallController.cpp
index 85a054a..3c070ce 100644
--- a/server/FirewallController.cpp
+++ b/server/FirewallController.cpp
@@ -41,7 +41,6 @@
 using android::base::Split;
 using android::base::StringAppendF;
 using android::base::StringPrintf;
-using android::bpf::BpfLevel;
 using android::net::gCtls;
 
 namespace {
@@ -55,7 +54,7 @@
 const char kUidMapProcFile[] = "/proc/self/uid_map";
 
 bool getBpfOwnerStatus() {
-    return gCtls->trafficCtrl.getBpfLevel() != BpfLevel::NONE;
+    return gCtls->trafficCtrl.getBpfEnabled();
 }
 
 }  // namespace