commit 93406acf63d10ba305494a87ba4f1a0eff7f6298
author Maciej Żenczykowski <maze@google.com> Tue May 31 15:30:07 2022 -0700
committer Maciej Żenczykowski <maze@google.com> Mon Jun 13 19:39:06 2022 -0700
tree 770218af2874533a3aa796e2a5e3de89296d06aa
parent 9406500d12c2c86756b506bf501becf031abeb21

TrafficController - minor cleanup

as requested by Patrick on:
  https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2006750

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I65d9d1fe883fe183d386a0810b19e20a99ed5811

service/native/TrafficController.cpp

diff --git a/service/native/TrafficController.cpp b/service/native/TrafficController.cpp
index d05e6fa..bce3bb5 100644
--- a/service/native/TrafficController.cpp
+++ b/service/native/TrafficController.cpp
@@ -488,8 +488,6 @@
               oldConfigure.error().message().c_str());
         return -oldConfigure.error().code();
     }
-    Status res;
-    BpfConfig newConfiguration;
     uint32_t match;
     switch (chain) {
         case DOZABLE:
@@ -519,9 +517,9 @@
         default:
             return -EINVAL;
     }
-    newConfiguration =
-            enable ? (oldConfigure.value() | match) : (oldConfigure.value() & (~match));
-    res = mConfigurationMap.writeValue(key, newConfiguration, BPF_EXIST);
+    BpfConfig newConfiguration =
+            enable ? (oldConfigure.value() | match) : (oldConfigure.value() & ~match);
+    Status res = mConfigurationMap.writeValue(key, newConfiguration, BPF_EXIST);
     if (!isOk(res)) {
         ALOGE("Failed to toggleUidOwnerMap(%d): %s", chain, res.msg().c_str());
     }