commit 622c72ea499f6627f60f88edd45e9067b800d479
author Wayne Ma <waynema@google.com> Tue Feb 15 10:33:23 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 15 10:33:23 2022 +0000
tree 8ca2c2a78137893da548474cdb2213f649bedade
parent a828eb711c3b22ff798dbebecf74ad34c6d38eea
parent 510c2f463fc5bfdc1a00f0e401ee44db269366a1

Merge "Address comment from aosp/1948169"

service/jni/com_android_server_BpfNetMaps.cpp

diff --git a/service/jni/com_android_server_BpfNetMaps.cpp b/service/jni/com_android_server_BpfNetMaps.cpp
index c29eb2b..85cfc09 100644
--- a/service/jni/com_android_server_BpfNetMaps.cpp
+++ b/service/jni/com_android_server_BpfNetMaps.cpp
@@ -116,27 +116,11 @@
     return (jint)res;
 }
 
-static FirewallType getFirewallType(ChildChain chain) {
-    switch (chain) {
-        case DOZABLE:
-            return ALLOWLIST;
-        case STANDBY:
-            return DENYLIST;
-        case POWERSAVE:
-            return ALLOWLIST;
-        case RESTRICTED:
-            return ALLOWLIST;
-        case NONE:
-        default:
-            return DENYLIST;
-    }
-}
-
 static jint native_setUidRule(JNIEnv* env, jobject clazz, jint childChain, jint uid,
                           jint firewallRule) {
     auto chain = static_cast<ChildChain>(childChain);
     auto rule = static_cast<FirewallRule>(firewallRule);
-    FirewallType fType = getFirewallType(chain);
+    FirewallType fType = mTc.getFirewallType(chain);
 
     int res = mTc.changeUidOwnerRule(chain, uid, rule, fType);
     if (res) {