commit | 3755929371dc952e19a98a91d5ed48c8bf9cc9e9 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Apr 04 22:38:27 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 04 22:38:27 2023 +0000 |
tree | 3710981bab4c4a37206fdbc5d676eda1bd4c63a0 | |
parent | ed21dcf98a861d66d14badbbf41320433219784a [diff] | |
parent | 184f31fa2f8763600f8cccc5cb5f451b1c528c2d [diff] |
Merge "call synchronizeKernelRCU() after writing false to disable" am: 184f31fa2f Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2520542 Change-Id: I01d403b453c2c047f030bcf98b7e7480ac63022a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/service-t/native/libs/libnetworkstats/NetworkTracePoller.cpp b/service-t/native/libs/libnetworkstats/NetworkTracePoller.cpp index 3abb49a..5cf6262 100644 --- a/service-t/native/libs/libnetworkstats/NetworkTracePoller.cpp +++ b/service-t/native/libs/libnetworkstats/NetworkTracePoller.cpp
@@ -99,6 +99,10 @@ ALOGW("Failed to disable tracing: %s", res.error().message().c_str()); } + // make sure everything in the system has actually seen the 'false' we just wrote + synchronizeKernelRCU(); + // things should now be well and truly disabled + mTaskRunner.reset(); mRingBuffer.reset();