commit 900f18e4612454052373a3141efc213187de63cd
author Luke Huang <huangluke@google.com> Thu Jan 31 16:50:17 2019 +0800
committer Luke Huang <huangluke@google.com> Wed Apr 03 14:21:52 2019 +0800
tree e979d6a80d9061f018fce48ece6791a5638e151e
parent aee15e050385efc64c9d47f6870dd0b1f4ef4d92

Fix DeathRecipient not work problem for UnsolicitedEventListener

linkToDeath of binder only use weak pointer ref for deathRecipient.
Hence local variable deathRecipient would destruct immediately after
registerUnsolEventListener function done.
Use a map to store all deathRecipient.

Bug: 129370555
Test: built, flashed, booted
          system/netd/tests/runtests.sh pass

Change-Id: I1829222dc071e237974033559bfbcce72b05d3fb

server/EventReporter.h

diff --git a/server/EventReporter.h b/server/EventReporter.h
index f471d7f..934aa7a 100644
--- a/server/EventReporter.h
+++ b/server/EventReporter.h
@@ -17,8 +17,8 @@
 #ifndef NETD_SERVER_EVENT_REPORTER_H
 #define NETD_SERVER_EVENT_REPORTER_H
 
+#include <map>
 #include <mutex>
-#include <set>
 
 #include <android-base/thread_annotations.h>
 #include <binder/IServiceManager.h>
@@ -31,25 +31,30 @@
  */
 class EventReporter {
   public:
-    using UnsolListeners = std::set<const android::sp<android::net::INetdUnsolicitedEventListener>>;
+    using UnsolListenerMap =
+            std::map<const android::sp<android::net::INetdUnsolicitedEventListener>,
+                     const android::sp<android::IBinder::DeathRecipient>>;
 
     // Returns the binder reference to the netd events listener service, attempting to fetch it if
     // we do not have it already. This method is threadsafe.
     android::sp<android::net::metrics::INetdEventListener> getNetdEventListener();
 
     // Returns a copy of the registered listeners.
-    UnsolListeners getNetdUnsolicitedEventListeners() EXCLUDES(mUnsolicitedMutex);
+    UnsolListenerMap getNetdUnsolicitedEventListenerMap() const EXCLUDES(mUnsolicitedMutex);
 
     void registerUnsolEventListener(
             const android::sp<android::net::INetdUnsolicitedEventListener>& listener)
             EXCLUDES(mUnsolicitedMutex);
+    void unregisterUnsolEventListener(
+            const android::sp<android::net::INetdUnsolicitedEventListener>& listener)
+            EXCLUDES(mUnsolicitedMutex);
 
   private:
     std::mutex mEventMutex;
-    std::mutex mUnsolicitedMutex;
+    mutable std::mutex mUnsolicitedMutex;
     android::sp<android::net::metrics::INetdEventListener> mNetdEventListener
             GUARDED_BY(mEventMutex);
-    UnsolListeners mUnsolListeners GUARDED_BY(mUnsolicitedMutex);
+    UnsolListenerMap mUnsolListenerMap GUARDED_BY(mUnsolicitedMutex);
 };
 
 #endif  // NETD_SERVER_EVENT_REPORTER_H