diff options
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index ef93801c4..9ab7fd206 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -76,6 +76,7 @@ import android.net.wifi.WpsResult.Status; import android.net.wifi.p2p.IWifiP2pManager; import android.os.BatteryStats; import android.os.Binder; +import android.os.Build; import android.os.Bundle; import android.os.IBinder; import android.os.INetworkManagementService; @@ -1312,10 +1313,12 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss mWifiNative.setSupplicantLogLevel("DEBUG"); setLogRecSize(ActivityManager.isLowRamDeviceStatic() ? NUM_LOG_RECS_VERBOSE_LOW_MEMORY : NUM_LOG_RECS_VERBOSE); + configureVerboseHalLogging(true); } else { DBG = false; mWifiNative.setSupplicantLogLevel("INFO"); setLogRecSize(NUM_LOG_RECS_NORMAL); + configureVerboseHalLogging(false); } mCountryCode.enableVerboseLogging(mVerboseLoggingLevel); mWifiLogger.startLogging(DBG); @@ -1329,6 +1332,18 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss } } + private static final String BUILD_TYPE_USER = "user"; + private static final String SYSTEM_PROPERTY_LOG_CONTROL_WIFIHAL = "log.tag.WifiHAL"; + private static final String LOGD_LEVEL_DEBUG = "D"; + private static final String LOGD_LEVEL_VERBOSE = "V"; + private void configureVerboseHalLogging(boolean enableVerbose) { + if (Build.TYPE == BUILD_TYPE_USER) { // Verbose HAL logging not supported on user builds. + return; + } + SystemProperties.set(SYSTEM_PROPERTY_LOG_CONTROL_WIFIHAL, + enableVerbose ? LOGD_LEVEL_VERBOSE : LOGD_LEVEL_DEBUG); + } + long mLastScanPermissionUpdate = 0; boolean mConnectedModeGScanOffloadStarted = false; // Don't do a G-scan enable/re-enable cycle more than once within 20seconds |