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

Commit 053ebdb4 authored by Sreeram Ramachandran's avatar Sreeram Ramachandran Committed by Android Git Automerger
Browse files

am ca7b0707: am 1d16570b: am aaea7e81: Merge "Eliminate race conditions in... 

am ca7b0707: am 1d16570b: am aaea7e81: Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev

* commit 'ca7b0707':
  Eliminate race conditions in UID-based network filtering.
parents c26b5b01 ca7b0707

core/java/android/net/NetworkState.java

+8 −3
Original line number Diff line number Diff line
@@ -29,20 +29,23 @@ public class NetworkState implements Parcelable { 
    public final NetworkInfo networkInfo;

    public final LinkProperties linkProperties;

    public final NetworkCapabilities networkCapabilities;

    public final Network network;

    /** Currently only used by testing. */

    public final String subscriberId;

    public final String networkId;



    public NetworkState(NetworkInfo networkInfo, LinkProperties linkProperties,

            NetworkCapabilities networkCapabilities) {

        this(networkInfo, linkProperties, networkCapabilities, null, null);

            NetworkCapabilities networkCapabilities, Network network) {

        this(networkInfo, linkProperties, networkCapabilities, network, null, null);

    }



    public NetworkState(NetworkInfo networkInfo, LinkProperties linkProperties,

            NetworkCapabilities networkCapabilities, String subscriberId, String networkId) {

            NetworkCapabilities networkCapabilities, Network network, String subscriberId,

            String networkId) {

        this.networkInfo = networkInfo;

        this.linkProperties = linkProperties;

        this.networkCapabilities = networkCapabilities;

        this.network = network;

        this.subscriberId = subscriberId;

        this.networkId = networkId;

    }
@@ -51,6 +54,7 @@ public class NetworkState implements Parcelable { 
        networkInfo = in.readParcelable(null);

        linkProperties = in.readParcelable(null);

        networkCapabilities = in.readParcelable(null);

        network = in.readParcelable(null);

        subscriberId = in.readString();

        networkId = in.readString();

    }
@@ -65,6 +69,7 @@ public class NetworkState implements Parcelable { 
        out.writeParcelable(networkInfo, flags);

        out.writeParcelable(linkProperties, flags);

        out.writeParcelable(networkCapabilities, flags);

        out.writeParcelable(network, flags);

        out.writeString(subscriberId);

        out.writeString(networkId);

    }

services/core/java/com/android/server/ConnectivityService.java

+122 −172

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -838,7 +838,7 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase { 
        info.setDetailedState(DetailedState.CONNECTED, null, null);

        final LinkProperties prop = new LinkProperties();

        prop.setInterfaceName(TEST_IFACE);

        return new NetworkState(info, prop, null, null, TEST_SSID);

        return new NetworkState(info, prop, null, null, null, TEST_SSID);

    }



    private void expectCurrentTime() throws Exception {

services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java

+3 −3
Original line number Diff line number Diff line
@@ -1006,7 +1006,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase { 
        info.setDetailedState(DetailedState.CONNECTED, null, null);

        final LinkProperties prop = new LinkProperties();

        prop.setInterfaceName(TEST_IFACE);

        return new NetworkState(info, prop, null, null, TEST_SSID);

        return new NetworkState(info, prop, null, null, null, TEST_SSID);

    }



    private static NetworkState buildMobile3gState(String subscriberId) {
@@ -1015,7 +1015,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase { 
        info.setDetailedState(DetailedState.CONNECTED, null, null);

        final LinkProperties prop = new LinkProperties();

        prop.setInterfaceName(TEST_IFACE);

        return new NetworkState(info, prop, null, subscriberId, null);

        return new NetworkState(info, prop, null, null, subscriberId, null);

    }



    private static NetworkState buildMobile4gState(String iface) {
@@ -1023,7 +1023,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase { 
        info.setDetailedState(DetailedState.CONNECTED, null, null);

        final LinkProperties prop = new LinkProperties();

        prop.setInterfaceName(iface);

        return new NetworkState(info, prop, null);

        return new NetworkState(info, prop, null, null);

    }



    private NetworkStats buildEmptyStats() {