summaryrefslogtreecommitdiffstats
path: root/wifi/java/android/net
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2013-10-14 10:49:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-14 10:49:34 -0700
commited22e9ce2f0672bed561fcb6d8e188cacda06b8c (patch)
tree2b7345c7a3ff3a7a7b4ca5b748d2fd10e6ea13de /wifi/java/android/net
parentac46ea109e4e45267eab3fd7d6f81ae3f6b0c4fc (diff)
parentdcc31551f80500a096b8eb95f7f0670b4c19fd95 (diff)
downloadframeworks_base-ed22e9ce2f0672bed561fcb6d8e188cacda06b8c.zip
frameworks_base-ed22e9ce2f0672bed561fcb6d8e188cacda06b8c.tar.gz
frameworks_base-ed22e9ce2f0672bed561fcb6d8e188cacda06b8c.tar.bz2
am dcc31551: am e9d99705: am 72dc0b43: Merge "Make Wifi Scans more heap-efficient" into klp-dev
* commit 'dcc31551f80500a096b8eb95f7f0670b4c19fd95': Make Wifi Scans more heap-efficient
Diffstat (limited to 'wifi/java/android/net')
-rw-r--r--wifi/java/android/net/wifi/WifiStateMachine.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java
index b4c583e..4bc3dda 100644
--- a/wifi/java/android/net/wifi/WifiStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiStateMachine.java
@@ -1031,7 +1031,8 @@ public class WifiStateMachine extends StateMachine {
int dist, distSd;
long tsf = 0;
dist = distSd = ScanResult.UNSPECIFIED;
- long now = SystemClock.elapsedRealtime();
+ final long now = SystemClock.elapsedRealtime();
+ final int bssidStrLen = BSSID_STR.length();
while (true) {
while (n < splitData.length) {
@@ -1068,7 +1069,8 @@ public class WifiStateMachine extends StateMachine {
} else if (splitData[n].equals(TRUNCATED)) {
batchedScanResult.truncated = true;
} else if (splitData[n].startsWith(BSSID_STR)) {
- bssid = splitData[n].substring(BSSID_STR.length());
+ bssid = new String(splitData[n].getBytes(), bssidStrLen,
+ splitData[n].length() - bssidStrLen);
} else if (splitData[n].startsWith(FREQ_STR)) {
try {
freq = Integer.parseInt(splitData[n].substring(FREQ_STR.length()));
@@ -1864,10 +1866,12 @@ public class WifiStateMachine extends StateMachine {
synchronized(mScanResultCache) {
mScanResults = new ArrayList<ScanResult>();
String[] lines = scanResults.split("\n");
+ final int bssidStrLen = BSSID_STR.length();
+ final int flagLen = FLAGS_STR.length();
for (String line : lines) {
if (line.startsWith(BSSID_STR)) {
- bssid = line.substring(BSSID_STR.length());
+ bssid = new String(line.getBytes(), bssidStrLen, line.length() - bssidStrLen);
} else if (line.startsWith(FREQ_STR)) {
try {
freq = Integer.parseInt(line.substring(FREQ_STR.length()));
@@ -1891,7 +1895,7 @@ public class WifiStateMachine extends StateMachine {
tsf = 0;
}
} else if (line.startsWith(FLAGS_STR)) {
- flags = line.substring(FLAGS_STR.length());
+ flags = new String(line.getBytes(), flagLen, line.length() - flagLen);
} else if (line.startsWith(SSID_STR)) {
wifiSsid = WifiSsid.createFromAsciiEncoded(
line.substring(SSID_STR.length()));