tree 7bf04959f7971bb1527dfcbadc29dd8cedd09c1d
parent 788f1f2cc105245438a96bab15c0aee2a4dedb63
author Amin Shaikh <ashaikh@google.com> 1486431669 -0800
committer Amin Shaikh <ashaikh@google.com> 1489017174 -0800

Move adjustCandidateWithUserSelection to WifiNetworkSelector

WifiNetworkSelector#setUserConnectChoice contains all of the logic for
favoring a user selected network over other visible networks present at
the last round on network selection. However, the logic for using this
data is contained in
SavedNetworkEvaluator#adjustCandidateWithUserSelection. This has the
side effect that RecommendedNetworkEvaluator or any new NetworkEvaluator
in the future can override the user's explicit intent to choose a
specific network. This change moves adjustCandidateWithUserSelection to
WifiNetworkSelector, fixing this bug and bringing all user connect
choice logic into the same class, WifiNetworkSelector.

Set a candidate ScanResult for every WifiConfiguration in
SavedNetworkEvaluator, regardless of whether it is externally scored.
This ensures that the user connect choice is respected if an externally
scored network is selected by a user over a secure saved network.

Bug: 34971941
Test: ./runtests.sh
Change-Id: I8730aee89dbee0ebb97161a56f00c026139ef5c9