summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2021-05-10 20:16:57 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-05-10 20:16:57 +0000
commit6818a436c1e3cf7d7fa8c961df4425b741f4a0b0 (patch)
treef0143a0f839517e29a6b9848af75f263683a0e3e
parent5e61988ce5c8406d2e4d78334f139f3bbf5d5bf5 (diff)
parentb1fc8c2f3d5fbd9d5615efc853492a944b40a075 (diff)
downloadnetd-6818a436c1e3cf7d7fa8c961df4425b741f4a0b0.tar.gz
Merge "Clean up unused declaration getNetworkForUserLocked" am: ed4bf44206 am: b6b3ba821e am: b1fc8c2f3d
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/1699468 Change-Id: I4e07f94a624a0037d2f502c4a7588a79b286cc85
-rw-r--r--server/NetworkController.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/server/NetworkController.h b/server/NetworkController.h
index 271f3e58..61ae1aad 100644
--- a/server/NetworkController.h
+++ b/server/NetworkController.h
@@ -154,8 +154,6 @@ public:
// set to a non-NETID_UNSET value if the user already has indicated a preference. Returns the
// fwmark value to set on the socket when performing the DNS request.
uint32_t getNetworkForDnsLocked(unsigned* netId, uid_t uid) const;
-
- unsigned getNetworkForUserLocked(uid_t uid) const;
unsigned getNetworkForConnectLocked(uid_t uid) const;
unsigned getNetworkForInterfaceLocked(const char* interface) const;
bool canProtectLocked(uid_t uid) const;