Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd43f37b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "passpoint-r2: copy updateIdenfier field in the copy constructor"

parents e3083a76 6d604136

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

+2 −0
Original line number Diff line number Diff line
@@ -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;

        }

    }

wifi/tests/src/android/net/wifi/WifiConfigurationTest.java

+14 −0
Original line number Diff line number Diff line
@@ -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();
@@ -250,6 +252,18 @@ public class WifiConfigurationTest { 
        assertEquals(defaultMac, config.getRandomizedMacAddress());

    }



    /**

     * 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.

     */