summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxin He <xinhe@google.com>2015-10-23 21:56:56 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-23 21:56:56 +0000
commit9f4c81f7018c3c8a5af1e0784b3c7d0a583ec95b (patch)
treeff807cbb728cc7b088af44e5bd1c42d79bf3c1d5
parent0b14bbb35f1561e7ab529e32fe529a041610cc68 (diff)
parentb5cef8e440ee5b054d8b38103aa2d6989c7361ef (diff)
downloadandroid_frameworks_opt_net_wifi-9f4c81f7018c3c8a5af1e0784b3c7d0a583ec95b.tar.gz
android_frameworks_opt_net_wifi-9f4c81f7018c3c8a5af1e0784b3c7d0a583ec95b.tar.bz2
android_frameworks_opt_net_wifi-9f4c81f7018c3c8a5af1e0784b3c7d0a583ec95b.zip
Merge "[DO NOT MERGE] Fix build breakage introduced by CL 797896" into mnc-dr-dev
am: b5cef8e440 * commit 'b5cef8e440ee5b054d8b38103aa2d6989c7361ef': [DO NOT MERGE] Fix build breakage introduced by CL 797896
-rw-r--r--service/java/com/android/server/wifi/WifiStateMachine.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 8e8678259..09f3d939f 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -4054,7 +4054,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
synchronized (mScanResultCache) {
// AutoJoincontroller will directly acces the scan result list and update it with
// ScanResult status
- mNumScanResultsKnown = 1mWifiAutoJoinController.newSupplicantResults(attemptAutoJoin);
+ mNumScanResultsKnown = mWifiAutoJoinController.newSupplicantResults(attemptAutoJoin);
}
}
if (linkDebouncing) {