diff options
Diffstat (limited to 'service')
7 files changed, 37 insertions, 34 deletions
diff --git a/service/java/com/android/server/wifi/WifiConnectivityManager.java b/service/java/com/android/server/wifi/WifiConnectivityManager.java index 0c3211d83..ffd9c9b16 100644 --- a/service/java/com/android/server/wifi/WifiConnectivityManager.java +++ b/service/java/com/android/server/wifi/WifiConnectivityManager.java @@ -132,7 +132,7 @@ public class WifiConnectivityManager { private final Handler mEventHandler; private final Clock mClock; private final LocalLog mLocalLog = - new LocalLog(ActivityManager.isLowRamDeviceStatic() ? 256 : 1024); + new LocalLog(ActivityManager.isLowRamDeviceStatic() ? 128 : 256); private final LinkedList<Long> mConnectionAttemptTimeStamps; private boolean mDbg = false; diff --git a/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java b/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java index a8021a7fc..1dba35f28 100644 --- a/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java +++ b/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java @@ -100,8 +100,7 @@ public class WifiQualifiedNetworkSelector { private static final int INVALID_TIME_STAMP = -1; private long mLastQualifiedNetworkSelectionTimeStamp = INVALID_TIME_STAMP; - // Temporarily, for dog food - private final LocalLog mLocalLog = new LocalLog(1024); + private final LocalLog mLocalLog = new LocalLog(512); private int mRssiScoreSlope = RSSI_SCORE_SLOPE; private int mRssiScoreOffset = RSSI_SCORE_OFFSET; private int mSameBssidAward = SAME_BSSID_AWARD; diff --git a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java index c36c7b121..bceae602e 100644 --- a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java +++ b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java @@ -76,7 +76,7 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub { private static final int MIN_PERIOD_PER_CHANNEL_MS = 200; // DFS needs 120 ms private static final int UNKNOWN_PID = -1; - private final LocalLog mLocalLog = new LocalLog(1024); + private final LocalLog mLocalLog = new LocalLog(512); private void localLog(String message) { mLocalLog.log(message); diff --git a/service/jni/com_android_server_wifi_WifiNative.cpp b/service/jni/com_android_server_wifi_WifiNative.cpp index f75fd9948..cae35c177 100644 --- a/service/jni/com_android_server_wifi_WifiNative.cpp +++ b/service/jni/com_android_server_wifi_WifiNative.cpp @@ -16,29 +16,31 @@ #define LOG_TAG "wifi" -#include "jni.h" -#include "JniConstants.h" -#include <ScopedUtfChars.h> -#include <ScopedBytes.h> -#include <utils/misc.h> -#include <utils/Log.h> -#include <utils/String16.h> #include <ctype.h> #include <stdlib.h> -#include <sys/socket.h> #include <sys/klog.h> -#include <linux/if.h> +#include <sys/socket.h> +/* We need linux/if_arp.h for ARPHRD_ETHER. Sadly, it forward declares + struct sockaddr and must be included after sys/socket.h. */ #include <linux/if_arp.h> #include <algorithm> #include <limits> #include <vector> -#include "wifi_system/wifi.h" -#include "hardware_legacy/wifi.h" -#include "hardware_legacy/wifi_hal.h" +#include <hardware_legacy/rtt.h> +#include <hardware_legacy/wifi.h> +#include <hardware_legacy/wifi_hal.h> +#include <log/log.h> +#include <nativehelper/JniConstants.h> +#include <nativehelper/ScopedBytes.h> +#include <nativehelper/ScopedUtfChars.h> +#include <nativehelper/jni.h> +#include <utils/String16.h> +#include <utils/misc.h> +#include <wifi_system/wifi.h> + #include "jni_helper.h" -#include "hardware_legacy/rtt.h" #include "wifi_hal_stub.h" #define REPLY_BUF_SIZE (4096 + 1) // wpa_supplicant's maximum size + 1 for nul #define EVENT_BUF_SIZE 2048 diff --git a/service/jni/com_android_server_wifi_nan_WifiNanNative.cpp b/service/jni/com_android_server_wifi_nan_WifiNanNative.cpp index fce4e93a7..42519e6d9 100644 --- a/service/jni/com_android_server_wifi_nan_WifiNanNative.cpp +++ b/service/jni/com_android_server_wifi_nan_WifiNanNative.cpp @@ -16,19 +16,20 @@ #define LOG_TAG "wifinan" -#include "jni.h" -#include "JniConstants.h" -#include <ScopedUtfChars.h> -#include <ScopedBytes.h> -#include <utils/misc.h> -#include <utils/Log.h> -#include <utils/String16.h> #include <ctype.h> #include <stdlib.h> #include <sys/socket.h> -#include <linux/if.h> -#include "wifi_system/wifi.h" -#include "hardware_legacy/wifi_hal.h" + +#include <hardware_legacy/wifi_hal.h> +#include <log/log.h> +#include <nativehelper/JniConstants.h> +#include <nativehelper/ScopedBytes.h> +#include <nativehelper/ScopedUtfChars.h> +#include <nativehelper/jni.h> +#include <utils/String16.h> +#include <utils/misc.h> +#include <wifi_system/wifi.h> + #include "jni_helper.h" namespace android { diff --git a/service/jni/jni_helper.cpp b/service/jni/jni_helper.cpp index f80b2bd7a..37015a1da 100644 --- a/service/jni/jni_helper.cpp +++ b/service/jni/jni_helper.cpp @@ -16,15 +16,15 @@ #define LOG_TAG "wifi" -#include "jni.h" -#include <ScopedUtfChars.h> -#include <utils/misc.h> #include <android_runtime/AndroidRuntime.h> +#include <hardware_legacy/wifi_hal.h> +#include <nativehelper/ScopedUtfChars.h> +#include <nativehelper/jni.h> #include <utils/Log.h> #include <utils/String16.h> +#include <utils/misc.h> +#include <wifi_system/wifi.h> -#include "wifi_system/wifi.h" -#include "hardware_legacy/wifi_hal.h" #include "jni_helper.h" namespace android { diff --git a/service/lib/wifi_hal_stub.cpp b/service/lib/wifi_hal_stub.cpp index f4c263fd9..fcf5a8db4 100644 --- a/service/lib/wifi_hal_stub.cpp +++ b/service/lib/wifi_hal_stub.cpp @@ -14,10 +14,11 @@ * limitations under the License. */ +#include "wifi_hal_stub.h" + #include <stdint.h> -#include "hardware_legacy/wifi_hal.h" -#include "wifi_hal_stub.h" +#include <hardware_legacy/wifi_hal.h> wifi_error wifi_initialize_stub(wifi_handle *handle) { return WIFI_ERROR_NOT_SUPPORTED; |