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

Commit 1835432b authored by paulhu's avatar paulhu
Browse files

Add NetworkCapabilities#deduceRestrictedCapability 

Support telephony mainline module usage.

Bug: 138306002
Test: atest FrameworksNetTests
      atest CtsNetTestCases --instant

Change-Id: Idbd9c547eff7227085c753461b901c7cdbe396fb
parent 00cf589f

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -4385,6 +4385,7 @@ package android.net { 
  }















  public final class NetworkCapabilities implements android.os.Parcelable {













    method public boolean deduceRestrictedCapability();















    method @NonNull public int[] getTransportTypes();















    method public boolean satisfiedByNetworkCapabilities(@Nullable android.net.NetworkCapabilities);















    method @NonNull public android.net.NetworkCapabilities setSSID(@Nullable String);

































core/java/android/net/NetworkCapabilities.java



+16
−8




























Original line number
Diff line number
Diff line








@@ -587,15 +587,14 @@ public final class NetworkCapabilities implements Parcelable {













    }































    /**













     * Removes the NET_CAPABILITY_NOT_RESTRICTED capability if all the capabilities it provides are













     * typically provided by restricted networks.













     * Deduces that all the capabilities it provides are typically provided by restricted networks













     * or not.















     *













     * TODO: consider:













     * - Renaming it to guessRestrictedCapability and make it set the













     *   restricted capability bit in addition to clearing it.













     * @return {@code true} if the network should be restricted.















     * @hide















     */













    public void maybeMarkCapabilitiesRestricted() {













    @SystemApi













    public boolean deduceRestrictedCapability() {















        // Check if we have any capability that forces the network to be restricted.















        final boolean forceRestrictedCapability =















                (mNetworkCapabilities & FORCE_RESTRICTED_CAPABILITIES) != 0;









@@ -609,8 +608,17 @@ public final class NetworkCapabilities implements Parcelable {













        final boolean hasRestrictedCapabilities =















                (mNetworkCapabilities & RESTRICTED_CAPABILITIES) != 0;





























        if (forceRestrictedCapability













                || (hasRestrictedCapabilities && !hasUnrestrictedCapabilities)) {













        return forceRestrictedCapability













                || (hasRestrictedCapabilities && !hasUnrestrictedCapabilities);













    }



























    /**













     * Removes the NET_CAPABILITY_NOT_RESTRICTED capability if deducing the network is restricted.













     *













     * @hide













     */













    public void maybeMarkCapabilitiesRestricted() {













        if (deduceRestrictedCapability()) {















            removeCapability(NET_CAPABILITY_NOT_RESTRICTED);















        }















    }