commit d1ee462e94c34193bf5e8eb2975fff61b82ab1fb
author Luke Huang <huangluke@google.com> Fri Jun 29 13:49:58 2018 +0800
committer Luke Huang <huangluke@google.com> Wed Jul 11 15:04:07 2018 +0800
tree dd8ba06ec3939751c61f9f1a672b2474729f2e5f
parent d4c0be8ed437ee2198a0d5d8561093ab23e51c2e

Replace RW lock with mutex, shared_mutex

Test: built, flashed, booted
      system/netd/tests/runtests.sh passes
Change-Id: I42b52d815b6ba0ba6f93dc27e83a900d2abec715

server/NetdNativeService.cpp

diff --git a/server/NetdNativeService.cpp b/server/NetdNativeService.cpp
index 5253096..99c4452 100644
--- a/server/NetdNativeService.cpp
+++ b/server/NetdNativeService.cpp
@@ -88,7 +88,7 @@
 
 #define NETD_LOCKING_RPC(permission, lock)                  \
     ENFORCE_PERMISSION(permission);                         \
-    android::RWLock::AutoWLock _lock(lock);
+    std::lock_guard<std::mutex> _lock(lock);
 
 #define NETD_BIG_LOCK_RPC(permission) NETD_LOCKING_RPC((permission), gBigNetdLock)
 
@@ -376,7 +376,7 @@
 }
 
 binder::Status NetdNativeService::tetherApplyDnsInterfaces(bool *ret) {
-    NETD_LOCKING_RPC(NETWORK_STACK, gCtls->tetherCtrl.lock)
+    NETD_LOCKING_RPC(NETWORK_STACK, gCtls->tetherCtrl.lock);
 
     *ret = gCtls->tetherCtrl.applyDnsInterfaces();
     return binder::Status::ok();
@@ -404,7 +404,7 @@
 }  // namespace
 
 binder::Status NetdNativeService::tetherGetStats(PersistableBundle *bundle) {
-    NETD_LOCKING_RPC(NETWORK_STACK, gCtls->tetherCtrl.lock)
+    NETD_LOCKING_RPC(NETWORK_STACK, gCtls->tetherCtrl.lock);
 
     const auto& statsList = gCtls->tetherCtrl.getTetherStats();
     if (!isOk(statsList)) {