commit ec23d76e2afdb147fe1ce6ba54b22e5f03f94098
author The Android Automerger <android-build@google.com> Tue Jun 16 01:03:28 2015 -0700
committer The Android Automerger <android-build@google.com> Tue Jun 16 01:03:28 2015 -0700
tree de34633b1d81b01412cb2f370038a97d090c0022
parent 5ca0ce0387ccaa71c18c09278bf8d810759c3aa9
parent 4678dd266774f6465726d1a53aafcd1a2adf61d4

merge in mnc-release history after reset to mnc-dev

bcmdhd/wifi_hal/wifi_logger.cpp

diff --git a/bcmdhd/wifi_hal/wifi_logger.cpp b/bcmdhd/wifi_hal/wifi_logger.cpp
index b401429..e93ae97 100644
--- a/bcmdhd/wifi_hal/wifi_logger.cpp
+++ b/bcmdhd/wifi_hal/wifi_logger.cpp
@@ -452,6 +452,14 @@
         return WIFI_SUCCESS;
     }
 
+    virtual int cancel() {
+        /* TODO: send a command to driver to stop generating logging events */
+
+        /* unregister event handler */
+        unregisterVendorHandler(GOOGLE_OUI, GOOGLE_DEBUG_RING_EVENT);
+        return WIFI_SUCCESS;
+    }
+
     virtual int handleEvent(WifiEvent& event) {
         char *buffer = NULL;
         int buffer_size = 0;