WifiLogger: make firmware dump conditional on verbose

We want to make firmware memory dump conditional on
verbose logging for it's own sake. But this also
sets the stage for the driver dump feature to be
conditional on verbose. (Driver dump is still in
the works.)

BUG=21661292
BUG=27554392
TEST=compile (more tests to come)

Change-Id: I22a753d785d1023a94f5c2e753714bc918b41fdf

1 files changed, 6 insertions, 2 deletions

diff --git a/service/java/com/android/server/wifi/WifiLogger.java b/service/java/com/android/server/wifi/WifiLogger.java
index 552049f74..df677b823 100644
--- a/service/java/com/android/server/wifi/WifiLogger.java
+++ b/service/java/com/android/server/wifi/WifiLogger.java
@@ -180,13 +180,13 @@ class WifiLogger extends BaseWifiLogger {
 
     @Override
     public synchronized void captureBugReportData(int reason) {
-        BugReport report = captureBugreport(reason, true);
+        BugReport report = captureBugreport(reason, isVerboseLoggingEnabled());
         mLastBugReports.addLast(report);
     }
 
     @Override
     public synchronized void captureAlertData(int errorCode, byte[] alertData) {
-        BugReport report = captureBugreport(errorCode, /* captureFWDump = */ true);
+        BugReport report = captureBugreport(errorCode, isVerboseLoggingEnabled());
         report.alertData = alertData;
         mLastAlerts.addLast(report);
     }
@@ -347,6 +347,10 @@ class WifiLogger extends BaseWifiLogger {
         }
     }
 
+    private boolean isVerboseLoggingEnabled() {
+        return mLogLevel > VERBOSE_NORMAL_LOG;
+    }
+
     private boolean fetchRingBuffers() {
         if (mRingBuffers != null) return true;