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

Commit 3906ff83 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Assign the bit calculation as long to prevent overflow" am: 00ccf9e4... 

Merge "Assign the bit calculation as long to prevent overflow" am: 00ccf9e4 am: e67182e5 am: d0a92ee2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664307

Change-Id: Ia3a1974227ebfd0069b288203df3551a561556eb
parents 3a33ad66 d0a92ee2

packages/Connectivity/framework/src/android/net/NetworkCapabilities.java

+9 −8
Original line number Diff line number Diff line
@@ -600,8 +600,9 @@ public final class NetworkCapabilities implements Parcelable { 
        // TODO: Consider adding unwanted capabilities to the public API and mention this

        // in the documentation.

        checkValidCapability(capability);

        mNetworkCapabilities |= 1 << capability;

        mUnwantedNetworkCapabilities &= ~(1 << capability);  // remove from unwanted capability list

        mNetworkCapabilities |= 1L << capability;

        // remove from unwanted capability list

        mUnwantedNetworkCapabilities &= ~(1L << capability);

        return this;

    }
@@ -620,8 +621,8 @@ public final class NetworkCapabilities implements Parcelable { 
     */

    public void addUnwantedCapability(@NetCapability int capability) {

        checkValidCapability(capability);

        mUnwantedNetworkCapabilities |= 1 << capability;

        mNetworkCapabilities &= ~(1 << capability);  // remove from requested capabilities

        mUnwantedNetworkCapabilities |= 1L << capability;

        mNetworkCapabilities &= ~(1L << capability);  // remove from requested capabilities

    }



    /**
@@ -634,7 +635,7 @@ public final class NetworkCapabilities implements Parcelable { 
     */

    public @NonNull NetworkCapabilities removeCapability(@NetCapability int capability) {

        checkValidCapability(capability);

        final long mask = ~(1 << capability);

        final long mask = ~(1L << capability);

        mNetworkCapabilities &= mask;

        return this;

    }
@@ -649,7 +650,7 @@ public final class NetworkCapabilities implements Parcelable { 
     */

    public @NonNull NetworkCapabilities removeUnwantedCapability(@NetCapability int capability) {

        checkValidCapability(capability);

        mUnwantedNetworkCapabilities &= ~(1 << capability);

        mUnwantedNetworkCapabilities &= ~(1L << capability);

        return this;

    }
@@ -717,14 +718,14 @@ public final class NetworkCapabilities implements Parcelable { 
     */

    public boolean hasCapability(@NetCapability int capability) {

        return isValidCapability(capability)

                && ((mNetworkCapabilities & (1 << capability)) != 0);

                && ((mNetworkCapabilities & (1L << capability)) != 0);

    }



    /** @hide */

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    public boolean hasUnwantedCapability(@NetCapability int capability) {

        return isValidCapability(capability)

                && ((mUnwantedNetworkCapabilities & (1 << capability)) != 0);

                && ((mUnwantedNetworkCapabilities & (1L << capability)) != 0);

    }



    /**

tests/net/java/com/android/server/ConnectivityServiceTest.java

+9 −4
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import static android.net.INetworkMonitor.NETWORK_VALIDATION_PROBE_HTTPS; 
import static android.net.INetworkMonitor.NETWORK_VALIDATION_PROBE_PRIVDNS;

import static android.net.INetworkMonitor.NETWORK_VALIDATION_RESULT_PARTIAL;

import static android.net.INetworkMonitor.NETWORK_VALIDATION_RESULT_VALID;

import static android.net.NetworkCapabilities.NET_CAPABILITY_BIP;

import static android.net.NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL;

import static android.net.NetworkCapabilities.NET_CAPABILITY_CBS;

import static android.net.NetworkCapabilities.NET_CAPABILITY_DUN;
@@ -89,6 +90,7 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_SUPL; 
import static android.net.NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_TRUSTED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_VSIM;

import static android.net.NetworkCapabilities.NET_CAPABILITY_WIFI_P2P;

import static android.net.NetworkCapabilities.NET_CAPABILITY_XCAP;

import static android.net.NetworkCapabilities.REDACT_FOR_ACCESS_FINE_LOCATION;
@@ -3030,10 +3032,11 @@ public class ConnectivityServiceTest { 
        // Verify NOT_RESTRICTED is set appropriately

        final NetworkCapabilities nc = new NetworkRequest.Builder().addCapability(capability)

                .build().networkCapabilities;

        if (capability == NET_CAPABILITY_CBS || capability == NET_CAPABILITY_DUN ||

                capability == NET_CAPABILITY_EIMS || capability == NET_CAPABILITY_FOTA ||

                capability == NET_CAPABILITY_IA || capability == NET_CAPABILITY_IMS ||

                capability == NET_CAPABILITY_RCS || capability == NET_CAPABILITY_XCAP

        if (capability == NET_CAPABILITY_CBS || capability == NET_CAPABILITY_DUN

                || capability == NET_CAPABILITY_EIMS || capability == NET_CAPABILITY_FOTA

                || capability == NET_CAPABILITY_IA || capability == NET_CAPABILITY_IMS

                || capability == NET_CAPABILITY_RCS || capability == NET_CAPABILITY_XCAP

                || capability == NET_CAPABILITY_VSIM || capability == NET_CAPABILITY_BIP

                || capability == NET_CAPABILITY_ENTERPRISE) {

            assertFalse(nc.hasCapability(NET_CAPABILITY_NOT_RESTRICTED));

        } else {
@@ -3168,6 +3171,8 @@ public class ConnectivityServiceTest { 
        tryNetworkFactoryRequests(NET_CAPABILITY_INTERNET);

        tryNetworkFactoryRequests(NET_CAPABILITY_TRUSTED);

        tryNetworkFactoryRequests(NET_CAPABILITY_NOT_VPN);

        tryNetworkFactoryRequests(NET_CAPABILITY_VSIM);

        tryNetworkFactoryRequests(NET_CAPABILITY_BIP);

        // Skipping VALIDATED and CAPTIVE_PORTAL as they're disallowed.

    }