diff options
| -rw-r--r-- | wifi/java/android/net/wifi/WifiConfiguration.java | 1 | ||||
| -rw-r--r-- | wifi/tests/src/android/net/wifi/WifiConfigurationTest.java | 32 |
2 files changed, 33 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 14deabec7467..2ba573c0cb3a 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -1295,6 +1295,7 @@ public class WifiConfiguration implements Parcelable { setConnectChoice(source.getConnectChoice()); setConnectChoiceTimestamp(source.getConnectChoiceTimestamp()); setHasEverConnected(source.getHasEverConnected()); + setNotRecommended(source.isNotRecommended()); } public void writeToParcel(Parcel dest) { diff --git a/wifi/tests/src/android/net/wifi/WifiConfigurationTest.java b/wifi/tests/src/android/net/wifi/WifiConfigurationTest.java index 5f9497474a77..632cfaf2155a 100644 --- a/wifi/tests/src/android/net/wifi/WifiConfigurationTest.java +++ b/wifi/tests/src/android/net/wifi/WifiConfigurationTest.java @@ -20,6 +20,7 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import android.os.Parcel; +import android.net.wifi.WifiConfiguration.NetworkSelectionStatus; import org.junit.Before; import org.junit.Test; @@ -66,4 +67,35 @@ public class WifiConfigurationTest { assertArrayEquals(bytes, rebytes); } + + @Test + public void testNetworkSelectionStatusCopy() { + NetworkSelectionStatus networkSelectionStatus = new NetworkSelectionStatus(); + networkSelectionStatus.setNotRecommended(true); + + NetworkSelectionStatus copy = new NetworkSelectionStatus(); + copy.copy(networkSelectionStatus); + + assertEquals(networkSelectionStatus.isNotRecommended(), copy.isNotRecommended()); + } + + @Test + public void testNetworkSelectionStatusParcel() { + NetworkSelectionStatus networkSelectionStatus = new NetworkSelectionStatus(); + networkSelectionStatus.setNotRecommended(true); + + Parcel parcelW = Parcel.obtain(); + networkSelectionStatus.writeToParcel(parcelW); + byte[] bytes = parcelW.marshall(); + parcelW.recycle(); + + Parcel parcelR = Parcel.obtain(); + parcelR.unmarshall(bytes, 0, bytes.length); + parcelR.setDataPosition(0); + + NetworkSelectionStatus copy = new NetworkSelectionStatus(); + copy.readFromParcel(parcelR); + + assertEquals(networkSelectionStatus.isNotRecommended(), copy.isNotRecommended()); + } } |