commit 521c66e73cbd48b11c2fe4b28ffcf4279acb045c
author Roshan Pius <rpius@google.com> Thu Aug 25 19:47:06 2016 -0700
committer Mitchell Wills <mwills@google.com> Mon Aug 29 11:26:57 2016 -0700
tree 7f5c516ecd5eab3db2228911f3b74c167ed915e5
parent 22de5aaca9b3d976d3f3cdf8b0a02f3b3ccb6d99

NetworkSelectionStatus: Fix copy constructor

Add couple of missing elements in the NetworkSelectionStatus copy constructor.

BUG: 31102798
Change-Id: Ie5f3719b94acf021d4ae2756afd635388640168c
(cherry picked from commit 699680b6b4fb923e4129d678013e3fbbc0421eaa)

wifi/java/android/net/wifi/WifiConfiguration.java

diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index 7db160f..7c5276c 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -1266,6 +1266,8 @@
             }
             mTemporarilyDisabledTimestamp = source.mTemporarilyDisabledTimestamp;
             mNetworkSelectionBSSID = source.mNetworkSelectionBSSID;
+            setCandidate(source.getCandidate());
+            setCandidateScore(source.getCandidateScore());
             setConnectChoice(source.getConnectChoice());
             setConnectChoiceTimestamp(source.getConnectChoiceTimestamp());
             setHasEverConnected(source.getHasEverConnected());