diff options
| author | Ken Chen <cken@google.com> | 2023-01-31 16:55:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-31 16:55:26 +0000 |
| commit | 83142c1f6dad5fe9ed626e80edf71e6378106a6d (patch) | |
| tree | fe1b1aafcf0ba06bd511b5c01d9e5bdd9df9b0ee | |
| parent | 66552adb64292641e355b6cbe83b7a881bba2e2b (diff) | |
| parent | 5a338fed071112ae354a41f85a721ccf69a53665 (diff) | |
| download | netd-83142c1f6dad5fe9ed626e80edf71e6378106a6d.tar.gz | |
Code Health: Reduce nesting am: 26bc3d1aba am: 5a338fed07
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2406635
Change-Id: Icb95a9744b9e77a2b4d2b93d05b548ecf300d781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | server/NetworkController.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/server/NetworkController.cpp b/server/NetworkController.cpp index 3e38d48e..e61ee306 100644 --- a/server/NetworkController.cpp +++ b/server/NetworkController.cpp @@ -827,11 +827,10 @@ bool NetworkController::isUidAllowed(unsigned netId, uid_t uid) const { Network* network = getNetworkLocked(netId); // Exempt when no netId is specified and there is no default network, so that apps or tests can // do DNS lookups for hostnames in etc/hosts. - if ((network && network->isUidAllowed(uid)) || - (netId == NETID_UNSET && mDefaultNetId == NETID_UNSET)) { + if (netId == NETID_UNSET && mDefaultNetId == NETID_UNSET) { return true; } - return false; + return network && network->isUidAllowed(uid); } bool NetworkController::isValidNetworkLocked(unsigned netId) const { |