From 15941215e85f924765f00779e9b5daff9ed6f118 Mon Sep 17 00:00:00 2001 From: Randy Pan Date: Tue, 24 May 2016 14:47:42 -0700 Subject: Wifi: local log size reduction Cut down the max number of lines allowed in Wifi LocalLogs. Currently LocalLog checks the number of lines in its buffer instead of total size in number of bytes. The buffer being used can grow really big if some lines are lengthy. Bug: 28865103 Change-Id: I7f77de1048bb465b79265b3ecb3a925e3a2659d9 Test: Wifi Framework Unit Tests --- service/java/com/android/server/wifi/WifiConnectivityManager.java | 2 +- service/java/com/android/server/wifi/WifiNative.java | 2 +- service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'service') diff --git a/service/java/com/android/server/wifi/WifiConnectivityManager.java b/service/java/com/android/server/wifi/WifiConnectivityManager.java index d99b65f8f..e19b7e3af 100644 --- a/service/java/com/android/server/wifi/WifiConnectivityManager.java +++ b/service/java/com/android/server/wifi/WifiConnectivityManager.java @@ -127,7 +127,7 @@ public class WifiConnectivityManager { private final Handler mEventHandler; private final Clock mClock; private final LocalLog mLocalLog = - new LocalLog(ActivityManager.isLowRamDeviceStatic() ? 1024 : 16384); + new LocalLog(ActivityManager.isLowRamDeviceStatic() ? 256 : 1024); private final LinkedList mConnectionAttemptTimeStamps; private boolean mDbg = false; diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java index 9e1c49204..fa8ce492d 100644 --- a/service/java/com/android/server/wifi/WifiNative.java +++ b/service/java/com/android/server/wifi/WifiNative.java @@ -102,7 +102,7 @@ public class WifiNative { */ public static final Object sLock = new Object(); - private static final LocalLog sLocalLog = new LocalLog(16384); + private static final LocalLog sLocalLog = new LocalLog(8192); public static LocalLog getLocalLog() { return sLocalLog; diff --git a/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java b/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java index edb539b90..82dc9e8ae 100644 --- a/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java +++ b/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java @@ -99,7 +99,7 @@ public class WifiQualifiedNetworkSelector { private long mLastQualifiedNetworkSelectionTimeStamp = INVALID_TIME_STAMP; // Temporarily, for dog food - private final LocalLog mLocalLog = new LocalLog(16384); + private final LocalLog mLocalLog = new LocalLog(1024); private int mRssiScoreSlope = RSSI_SCORE_SLOPE; private int mRssiScoreOffset = RSSI_SCORE_OFFSET; private int mSameBssidAward = SAME_BSSID_AWARD; -- cgit v1.2.3