diff options
| -rw-r--r-- | wifi/java/android/net/wifi/WifiConfiguration.java | 2 | ||||
| -rw-r--r-- | wifi/tests/src/android/net/wifi/WifiConfigurationTest.java | 14 |
2 files changed, 16 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 28dd9b471323..85871feba12d 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -1886,6 +1886,7 @@ public class WifiConfiguration implements Parcelable { if (creatorName != null) sbuf.append(" cname=" + creatorName); if (lastUpdateUid != 0) sbuf.append(" luid=" + lastUpdateUid); if (lastUpdateName != null) sbuf.append(" lname=" + lastUpdateName); + if (updateIdentifier != null) sbuf.append(" updateIdentifier=" + updateIdentifier); sbuf.append(" lcuid=" + lastConnectUid); sbuf.append(" userApproved=" + userApprovedAsString(userApproved)); sbuf.append(" noInternetAccessExpected=" + noInternetAccessExpected); @@ -2281,6 +2282,7 @@ public class WifiConfiguration implements Parcelable { mRandomizedMacAddress = source.mRandomizedMacAddress; macRandomizationSetting = source.macRandomizationSetting; requirePMF = source.requirePMF; + updateIdentifier = source.updateIdentifier; } } diff --git a/wifi/tests/src/android/net/wifi/WifiConfigurationTest.java b/wifi/tests/src/android/net/wifi/WifiConfigurationTest.java index c744f18cf408..7bff68aaaa97 100644 --- a/wifi/tests/src/android/net/wifi/WifiConfigurationTest.java +++ b/wifi/tests/src/android/net/wifi/WifiConfigurationTest.java @@ -59,6 +59,7 @@ public class WifiConfigurationTest { WifiConfiguration config = new WifiConfiguration(); config.setPasspointManagementObjectTree(cookie); config.trusted = false; + config.updateIdentifier = "1234"; MacAddress macBeforeParcel = config.getOrCreateRandomizedMacAddress(); Parcel parcelW = Parcel.obtain(); config.writeToParcel(parcelW, 0); @@ -73,6 +74,7 @@ public class WifiConfigurationTest { // lacking a useful config.equals, check two fields near the end. assertEquals(cookie, reconfig.getMoTree()); assertEquals(macBeforeParcel, reconfig.getOrCreateRandomizedMacAddress()); + assertEquals(config.updateIdentifier, reconfig.updateIdentifier); assertFalse(reconfig.trusted); Parcel parcelWW = Parcel.obtain(); @@ -251,6 +253,18 @@ public class WifiConfigurationTest { } /** + * Verifies that updateIdentifier should be copied for copy constructor. + */ + @Test + public void testUpdateIdentifierForCopyConstructor() { + WifiConfiguration config = new WifiConfiguration(); + config.updateIdentifier = "1234"; + WifiConfiguration copyConfig = new WifiConfiguration(config); + + assertEquals(config.updateIdentifier, copyConfig.updateIdentifier); + } + + /** * Verifies that the serialization/de-serialization for softap config works. */ @Test |