summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandy Pan <zpan@google.com>2016-05-25 00:20:28 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-25 00:20:28 +0000
commitd2fffaa41f74ba0aa9981f5f53bad27a3c5d7bc6 (patch)
treea4811e2cb176963e4ab8e2cc220cd1e0135a6c18
parent28eb5a8fe0851fb468f302aa8684dc0d3ada739e (diff)
parent3126f8d5394f8790e9c4ed4ab5c47fcc686e6803 (diff)
Merge "Wifi: local log size reduction" into nyc-dev
am: 3126f8d539 * commit '3126f8d5394f8790e9c4ed4ab5c47fcc686e6803': Wifi: local log size reduction Change-Id: I5162f3d6c30c11b170360ff5dcec0e719a156dcf
-rw-r--r--service/java/com/android/server/wifi/WifiConnectivityManager.java2
-rw-r--r--service/java/com/android/server/wifi/WifiNative.java2
-rw-r--r--service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/service/java/com/android/server/wifi/WifiConnectivityManager.java b/service/java/com/android/server/wifi/WifiConnectivityManager.java
index 3071fbf12..1f1a08b6a 100644
--- a/service/java/com/android/server/wifi/WifiConnectivityManager.java
+++ b/service/java/com/android/server/wifi/WifiConnectivityManager.java
@@ -128,7 +128,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<Long> 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;