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

1 files changed, 4 insertions, 4 deletions

diff --git a/service/java/com/android/server/wifi/WifiDiagnostics.java b/service/java/com/android/server/wifi/WifiDiagnostics.java
index 6fc75c6ea..38045625e 100644
--- a/service/java/com/android/server/wifi/WifiDiagnostics.java
+++ b/service/java/com/android/server/wifi/WifiDiagnostics.java
@@ -226,6 +226,10 @@ class WifiDiagnostics extends BaseWifiDiagnostics {
         if (!mActiveInterfaces.isEmpty()) {
             return;
         }
+        if (mLogLevel != VERBOSE_NO_LOG) {
+            stopLoggingAllBuffers();
+            mRingBuffers = null;
+        }
         if (mIsLoggingEventHandlerRegistered) {
             if (!mWifiNative.resetLogHandler()) {
                 mLog.wC("Fail to reset log handler");
@@ -236,10 +240,6 @@ class WifiDiagnostics extends BaseWifiDiagnostics {
             // the log handler is in an indeterminate state.
             mIsLoggingEventHandlerRegistered = false;
         }
-        if (mLogLevel != VERBOSE_NO_LOG) {
-            stopLoggingAllBuffers();
-            mRingBuffers = null;
-        }
     }
 
     @Override