Merge commit '3f3ed24' into stage-aosp-master

This commit is contained in:
The Android Automerger
2016-09-02 07:19:56 +00:00

View File

@@ -1266,6 +1266,7 @@ public class WifiConfiguration implements Parcelable {
}
mTemporarilyDisabledTimestamp = source.mTemporarilyDisabledTimestamp;
mNetworkSelectionBSSID = source.mNetworkSelectionBSSID;
setSeenInLastQualifiedNetworkSelection(source.getSeenInLastQualifiedNetworkSelection());
setCandidate(source.getCandidate());
setCandidateScore(source.getCandidateScore());
setConnectChoice(source.getConnectChoice());