Merge commit '3f3ed24' into stage-aosp-master am: e9b6029153

am: 756cbb248e

Change-Id: I8d6ad1bcd2c41553ced95c9f59e8a35889d24edf
This commit is contained in:
Roshan Pius
2016-09-02 07:32:34 +00:00
committed by android-build-merger

View File

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