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

Commit 79169e1a authored by lucaslin's avatar lucaslin Committed by Lucas Lin
Browse files

Replace hidden API with public API 

NetworkInfo will be a part of mainline module, so external callers
cannot call its hidden API. Use the public API instead.

Bug: 182859030
Test: 1. Remove "framework-connectivity.impl"
      2. make SettingsLibs
Change-Id: I671aaf5099f7cd3459588a78cb99de39a0e23f95
Merged-In: I671aaf5099f7cd3459588a78cb99de39a0e23f95
    (Cherry-picked from ag/14140215)
parent 9ef59ac9

packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java

+14 −4
Original line number Diff line number Diff line
@@ -683,6 +683,16 @@ public class AccessPointTest { 
        assertThat(ap.getTitle()).isEqualTo(providerFriendlyName);

    }



    // This method doesn't copy mIsFailover, mIsAvailable and mIsRoaming because NetworkInfo

    // doesn't expose those three set methods. But that's fine since the tests don't use those three

    // variables.

    private NetworkInfo copyNetworkInfo(NetworkInfo ni) {

        final NetworkInfo copy = new NetworkInfo(ni.getType(), ni.getSubtype(), ni.getTypeName(),

                ni.getSubtypeName());

        copy.setDetailedState(ni.getDetailedState(), ni.getReason(), ni.getExtraInfo());

        return copy;

    }



    @Test

    public void testUpdateNetworkInfo_returnsTrue() {

        int networkId = 123;
@@ -704,7 +714,7 @@ public class AccessPointTest { 
                .setWifiInfo(wifiInfo)

                .build();



        NetworkInfo newInfo = new NetworkInfo(networkInfo);

        NetworkInfo newInfo = copyNetworkInfo(networkInfo);

        newInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, "", "");

        assertThat(ap.update(config, wifiInfo, newInfo)).isTrue();

    }
@@ -730,7 +740,7 @@ public class AccessPointTest { 
                .setWifiInfo(wifiInfo)

                .build();



        NetworkInfo newInfo = new NetworkInfo(networkInfo); // same values

        NetworkInfo newInfo = copyNetworkInfo(networkInfo); // same values

        assertThat(ap.update(config, wifiInfo, newInfo)).isFalse();

    }
@@ -755,7 +765,7 @@ public class AccessPointTest { 
                .setWifiInfo(wifiInfo)

                .build();



        NetworkInfo newInfo = new NetworkInfo(networkInfo); // same values

        NetworkInfo newInfo = copyNetworkInfo(networkInfo); // same values

        wifiInfo.setRssi(rssi + 1);

        assertThat(ap.update(config, wifiInfo, newInfo)).isTrue();

    }
@@ -781,7 +791,7 @@ public class AccessPointTest { 
                .setWifiInfo(wifiInfo)

                .build();



        NetworkInfo newInfo = new NetworkInfo(networkInfo); // same values

        NetworkInfo newInfo = copyNetworkInfo(networkInfo); // same values

        wifiInfo.setRssi(WifiInfo.INVALID_RSSI);

        assertThat(ap.update(config, wifiInfo, newInfo)).isFalse();

    }