Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a0bc12d authored by Oscar Shu's avatar Oscar Shu Committed by Automerger Merge Worker
Browse files

Merge "Ringbuffer stops logging after wifi toggle" into rvc-qpr-dev am: cb07b80c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12257415

Change-Id: I01871d3967f95e0baf10941162bf3b2a9f7a5204
parents 375ea0d2 cb07b80c

wifi/1.4/default/wifi_chip.cpp

+14 −2
Original line number Diff line number Diff line
@@ -624,6 +624,15 @@ Return<void> WifiChip::getCapabilities_1_3(getCapabilities_cb hidl_status_cb) { 
Return<void> WifiChip::debug(const hidl_handle& handle,

                             const hidl_vec<hidl_string>&) {

    if (handle != nullptr && handle->numFds >= 1) {

        {

            std::unique_lock<std::mutex> lk(lock_t);

            for (const auto& item : ringbuffer_map_) {

                forceDumpToDebugRingBufferInternal(item.first);

            }

            // unique_lock unlocked here

        }

        usleep(100 * 1000);  // sleep for 100 milliseconds to wait for

                             // ringbuffer updates.

        int fd = handle->data[0];

        if (!writeRingbufferFilesInternal()) {

            LOG(ERROR) << "Error writing files to flash";
@@ -1120,6 +1129,9 @@ WifiStatus WifiChip::stopLoggingToDebugRingBufferInternal() { 
    legacy_hal::wifi_error legacy_status =

        legacy_hal_.lock()->deregisterRingBufferCallbackHandler(

            getFirstActiveWlanIfaceName());

    if (legacy_status == legacy_hal::WIFI_SUCCESS) {

        debug_ring_buffer_cb_registered_ = false;

    }

    return createWifiStatusFromLegacyError(legacy_status);

}
@@ -1335,7 +1347,7 @@ WifiStatus WifiChip::registerDebugRingBufferCallback() { 
                    LOG(ERROR) << "Ringname " << name << " not found";

                    return;

                }

                // unlock

                // unique_lock unlocked here

            }

        };

    legacy_hal::wifi_error legacy_status =
@@ -1637,7 +1649,7 @@ bool WifiChip::writeRingbufferFilesInternal() { 
                }

            }

        }

        // unlock

        // unique_lock unlocked here

    }

    return true;

}