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

Commit a0445d35 authored by Chiachang Wang's avatar Chiachang Wang Committed by Gerrit Code Review
Browse files

Merge "Rename APIs in NetworkAgentConfig.Builder"

parents b82fad9a e9f341c2

packages/Connectivity/framework/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -259,15 +259,15 @@ package android.net { 
  public static final class NetworkAgentConfig.Builder {

    ctor public NetworkAgentConfig.Builder();

    method @NonNull public android.net.NetworkAgentConfig build();

    method @NonNull public android.net.NetworkAgentConfig.Builder disableNat64Detection();

    method @NonNull public android.net.NetworkAgentConfig.Builder disableProvisioningNotification();

    method @NonNull public android.net.NetworkAgentConfig.Builder setExplicitlySelected(boolean);

    method @NonNull public android.net.NetworkAgentConfig.Builder setLegacyExtraInfo(@NonNull String);

    method @NonNull public android.net.NetworkAgentConfig.Builder setLegacySubType(int);

    method @NonNull public android.net.NetworkAgentConfig.Builder setLegacySubTypeName(@NonNull String);

    method @NonNull public android.net.NetworkAgentConfig.Builder setLegacyType(int);

    method @NonNull public android.net.NetworkAgentConfig.Builder setLegacyTypeName(@NonNull String);

    method @NonNull public android.net.NetworkAgentConfig.Builder setNat64DetectionEnabled(boolean);

    method @NonNull public android.net.NetworkAgentConfig.Builder setPartialConnectivityAcceptable(boolean);

    method @NonNull public android.net.NetworkAgentConfig.Builder setProvisioningNotificationEnabled(boolean);

    method @NonNull public android.net.NetworkAgentConfig.Builder setUnvalidatedConnectivityAcceptable(boolean);

  }

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

+10 −8
Original line number Diff line number Diff line
@@ -311,26 +311,28 @@ public final class NetworkAgentConfig implements Parcelable { 
        }



        /**

         * Disables active detection of NAT64 (e.g., via RFC 7050 DNS lookups). Used to save power

         * and reduce idle traffic on networks that are known to be IPv6-only without a NAT64.

         * Enables or disables active detection of NAT64 (e.g., via RFC 7050 DNS lookups). Used to

         * save power and reduce idle traffic on networks that are known to be IPv6-only without a

         * NAT64. By default, NAT64 detection is enabled.

         *

         * @return this builder, to facilitate chaining.

         */

        @NonNull

        public Builder disableNat64Detection() {

            mConfig.skip464xlat = true;

        public Builder setNat64DetectionEnabled(boolean enabled) {

            mConfig.skip464xlat = !enabled;

            return this;

        }



        /**

         * Disables the "Sign in to network" notification. Used if the network transport will

         * perform its own carrier-specific provisioning procedure.

         * Enables or disables the "Sign in to network" notification. Used if the network transport

         * will perform its own carrier-specific provisioning procedure. By default, the

         * notification is enabled.

         *

         * @return this builder, to facilitate chaining.

         */

        @NonNull

        public Builder disableProvisioningNotification() {

            mConfig.provisioningNotificationDisabled = true;

        public Builder setProvisioningNotificationEnabled(boolean enabled) {

            mConfig.provisioningNotificationDisabled = !enabled;

            return this;

        }

tests/net/common/java/android/net/NetworkAgentConfigTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ class NetworkAgentConfigTest { 
            setPartialConnectivityAcceptable(false)

            setUnvalidatedConnectivityAcceptable(true)

            setLegacyTypeName("TEST_NETWORK")

            disableNat64Detection()

            disableProvisioningNotification()

            setNat64DetectionEnabled(false)

            setProvisioningNotificationEnabled(false)

        }.build()



        assertTrue(config.isExplicitlySelected())