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

Commit a8f39570 authored by Hugo Benichi's avatar Hugo Benichi
Browse files

DO NOT MERGE Ignore DUN in describeImmutableDifferences 

This patch changes describeImmutableDifferences in NetworkCapabilities
to ignore differences in NET_CAPABILITY_DUN, so that updateCapabilities
in ConnectivityService to not report wtf errors when a NetworkAgent
degrades its NetworkCapabilities object by removing NET_CAPABILITY_DUN.

Bug: 65257223
Test: runtest frameworks-net
Change-Id: I115ed1b366da01a3f8c3c6e97e0db8ce995fd377
parent 71acf707

core/java/android/net/NetworkCapabilities.java

+3 −1
Original line number Diff line number Diff line
@@ -772,7 +772,9 @@ public final class NetworkCapabilities implements Parcelable { 


        // Ignore NOT_METERED being added or removed as it is effectively dynamic. http://b/63326103

        // TODO: properly support NOT_METERED as a mutable and requestable capability.

        final long mask = ~MUTABLE_CAPABILITIES & ~(1 << NET_CAPABILITY_NOT_METERED);

        // Ignore DUN being added or removed. http://b/65257223.

        final long mask = ~MUTABLE_CAPABILITIES

                & ~(1 << NET_CAPABILITY_NOT_METERED) & ~(1 << NET_CAPABILITY_DUN);

        long oldImmutableCapabilities = this.mNetworkCapabilities & mask;

        long newImmutableCapabilities = that.mNetworkCapabilities & mask;

        if (oldImmutableCapabilities != newImmutableCapabilities) {

tests/net/java/android/net/NetworkCapabilitiesTest.java

+9 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.net;



import static android.net.NetworkCapabilities.NET_CAPABILITY_CBS;

import static android.net.NetworkCapabilities.NET_CAPABILITY_DUN;

import static android.net.NetworkCapabilities.NET_CAPABILITY_EIMS;

import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;
@@ -143,6 +144,14 @@ public class NetworkCapabilitiesTest { 
        assertEquals("", nc1.describeImmutableDifferences(nc2));

        assertEquals("", nc1.describeImmutableDifferences(nc1));



        // DUN changing (http://b/65257223)

        nc1 = new NetworkCapabilities()

                .addCapability(NET_CAPABILITY_DUN)

                .addCapability(NET_CAPABILITY_INTERNET);

        nc2 = new NetworkCapabilities().addCapability(NET_CAPABILITY_INTERNET);

        assertEquals("", nc1.describeImmutableDifferences(nc2));

        assertEquals("", nc1.describeImmutableDifferences(nc1));



        // Immutable capability changing

        nc1 = new NetworkCapabilities()

                .addCapability(NET_CAPABILITY_INTERNET)