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

Commit 9581e2fe authored by Xiao Ma's avatar Xiao Ma Committed by android-build-merger
Browse files

Add DHCP Rapid Commit FILS support. am: 4a8d1d42 am: 423e7388 

am: 80552ad4

Change-Id: I28c24332a196019f604932abaa24e6115838c6cc
parents 18ad9350 80552ad4

common/moduleutils/src/android/net/shared/ProvisioningConfiguration.java

+14 −0
Original line number Original line Diff line number Diff line
@@ -120,6 +120,14 @@ public class ProvisioningConfiguration { 
            return this;

            return this;

        }

        }





        /**

         * Specify that preconnection feature would be enabled. It's not used by default.

         */

        public Builder withPreconnection() {

            mConfig.mEnablePreconnection = true;

            return this;

        }



        /**

        /**

         * Specify the initial provisioning configuration.

         * Specify the initial provisioning configuration.

         */

         */
@@ -194,6 +202,7 @@ public class ProvisioningConfiguration { 




    public boolean mEnableIPv4 = true;

    public boolean mEnableIPv4 = true;

    public boolean mEnableIPv6 = true;

    public boolean mEnableIPv6 = true;

    public boolean mEnablePreconnection = false;

    public boolean mUsingMultinetworkPolicyTracker = true;

    public boolean mUsingMultinetworkPolicyTracker = true;

    public boolean mUsingIpReachabilityMonitor = true;

    public boolean mUsingIpReachabilityMonitor = true;

    public int mRequestedPreDhcpActionMs;

    public int mRequestedPreDhcpActionMs;
@@ -210,6 +219,7 @@ public class ProvisioningConfiguration { 
    public ProvisioningConfiguration(ProvisioningConfiguration other) {

    public ProvisioningConfiguration(ProvisioningConfiguration other) {

        mEnableIPv4 = other.mEnableIPv4;

        mEnableIPv4 = other.mEnableIPv4;

        mEnableIPv6 = other.mEnableIPv6;

        mEnableIPv6 = other.mEnableIPv6;

        mEnablePreconnection = other.mEnablePreconnection;

        mUsingMultinetworkPolicyTracker = other.mUsingMultinetworkPolicyTracker;

        mUsingMultinetworkPolicyTracker = other.mUsingMultinetworkPolicyTracker;

        mUsingIpReachabilityMonitor = other.mUsingIpReachabilityMonitor;

        mUsingIpReachabilityMonitor = other.mUsingIpReachabilityMonitor;

        mRequestedPreDhcpActionMs = other.mRequestedPreDhcpActionMs;

        mRequestedPreDhcpActionMs = other.mRequestedPreDhcpActionMs;
@@ -231,6 +241,7 @@ public class ProvisioningConfiguration { 
        final ProvisioningConfigurationParcelable p = new ProvisioningConfigurationParcelable();

        final ProvisioningConfigurationParcelable p = new ProvisioningConfigurationParcelable();

        p.enableIPv4 = mEnableIPv4;

        p.enableIPv4 = mEnableIPv4;

        p.enableIPv6 = mEnableIPv6;

        p.enableIPv6 = mEnableIPv6;

        p.enablePreconnection = mEnablePreconnection;

        p.usingMultinetworkPolicyTracker = mUsingMultinetworkPolicyTracker;

        p.usingMultinetworkPolicyTracker = mUsingMultinetworkPolicyTracker;

        p.usingIpReachabilityMonitor = mUsingIpReachabilityMonitor;

        p.usingIpReachabilityMonitor = mUsingIpReachabilityMonitor;

        p.requestedPreDhcpActionMs = mRequestedPreDhcpActionMs;

        p.requestedPreDhcpActionMs = mRequestedPreDhcpActionMs;
@@ -255,6 +266,7 @@ public class ProvisioningConfiguration { 
        final ProvisioningConfiguration config = new ProvisioningConfiguration();

        final ProvisioningConfiguration config = new ProvisioningConfiguration();

        config.mEnableIPv4 = p.enableIPv4;

        config.mEnableIPv4 = p.enableIPv4;

        config.mEnableIPv6 = p.enableIPv6;

        config.mEnableIPv6 = p.enableIPv6;

        config.mEnablePreconnection = p.enablePreconnection;

        config.mUsingMultinetworkPolicyTracker = p.usingMultinetworkPolicyTracker;

        config.mUsingMultinetworkPolicyTracker = p.usingMultinetworkPolicyTracker;

        config.mUsingIpReachabilityMonitor = p.usingIpReachabilityMonitor;

        config.mUsingIpReachabilityMonitor = p.usingIpReachabilityMonitor;

        config.mRequestedPreDhcpActionMs = p.requestedPreDhcpActionMs;

        config.mRequestedPreDhcpActionMs = p.requestedPreDhcpActionMs;
@@ -275,6 +287,7 @@ public class ProvisioningConfiguration { 
        return new StringJoiner(", ", getClass().getSimpleName() + "{", "}")

        return new StringJoiner(", ", getClass().getSimpleName() + "{", "}")

                .add("mEnableIPv4: " + mEnableIPv4)

                .add("mEnableIPv4: " + mEnableIPv4)

                .add("mEnableIPv6: " + mEnableIPv6)

                .add("mEnableIPv6: " + mEnableIPv6)

                .add("mEnablePreconnection: " + mEnablePreconnection)

                .add("mUsingMultinetworkPolicyTracker: " + mUsingMultinetworkPolicyTracker)

                .add("mUsingMultinetworkPolicyTracker: " + mUsingMultinetworkPolicyTracker)

                .add("mUsingIpReachabilityMonitor: " + mUsingIpReachabilityMonitor)

                .add("mUsingIpReachabilityMonitor: " + mUsingIpReachabilityMonitor)

                .add("mRequestedPreDhcpActionMs: " + mRequestedPreDhcpActionMs)

                .add("mRequestedPreDhcpActionMs: " + mRequestedPreDhcpActionMs)
@@ -294,6 +307,7 @@ public class ProvisioningConfiguration { 
        final ProvisioningConfiguration other = (ProvisioningConfiguration) obj;

        final ProvisioningConfiguration other = (ProvisioningConfiguration) obj;

        return mEnableIPv4 == other.mEnableIPv4

        return mEnableIPv4 == other.mEnableIPv4

                && mEnableIPv6 == other.mEnableIPv6

                && mEnableIPv6 == other.mEnableIPv6

                && mEnablePreconnection == other.mEnablePreconnection

                && mUsingMultinetworkPolicyTracker == other.mUsingMultinetworkPolicyTracker

                && mUsingMultinetworkPolicyTracker == other.mUsingMultinetworkPolicyTracker

                && mUsingIpReachabilityMonitor == other.mUsingIpReachabilityMonitor

                && mUsingIpReachabilityMonitor == other.mUsingIpReachabilityMonitor

                && mRequestedPreDhcpActionMs == other.mRequestedPreDhcpActionMs

                && mRequestedPreDhcpActionMs == other.mRequestedPreDhcpActionMs

common/networkstackclient/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -50,6 +50,7 @@ aidl_interface { 
        "src/android/net/INetworkStackConnector.aidl",

        "src/android/net/INetworkStackConnector.aidl",

        "src/android/net/INetworkStackStatusCallback.aidl",

        "src/android/net/INetworkStackStatusCallback.aidl",

        "src/android/net/InitialConfigurationParcelable.aidl",

        "src/android/net/InitialConfigurationParcelable.aidl",

        "src/android/net/Layer2PacketParcelable.aidl",

        "src/android/net/NattKeepalivePacketDataParcelable.aidl",

        "src/android/net/NattKeepalivePacketDataParcelable.aidl",

        "src/android/net/PrivateDnsConfigParcel.aidl",

        "src/android/net/PrivateDnsConfigParcel.aidl",

        "src/android/net/ProvisioningConfigurationParcelable.aidl",

        "src/android/net/ProvisioningConfigurationParcelable.aidl",

common/networkstackclient/src/android/net/Layer2PacketParcelable.aidl

0 → 100644
+24 −0
Original line number Original line Diff line number Diff line 
/**

 * Copyright (c) 2019, The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing perNmissions and

 * limitations under the License.

 */



package android.net;



import android.net.MacAddress;



parcelable Layer2PacketParcelable {

    MacAddress dstMacAddress;

    byte[] payload;

}

common/networkstackclient/src/android/net/ProvisioningConfigurationParcelable.aidl

+1 −0
Original line number Original line Diff line number Diff line
@@ -35,4 +35,5 @@ parcelable ProvisioningConfigurationParcelable { 
    int ipv6AddrGenMode;

    int ipv6AddrGenMode;

    Network network;

    Network network;

    String displayName;

    String displayName;

    boolean enablePreconnection;

}
 
}

common/networkstackclient/src/android/net/ip/IIpClient.aidl

+1 −0
Original line number Original line Diff line number Diff line
@@ -35,4 +35,5 @@ oneway interface IIpClient { 
    void removeKeepalivePacketFilter(int slot);

    void removeKeepalivePacketFilter(int slot);

    void setL2KeyAndGroupHint(in String l2Key, in String groupHint);

    void setL2KeyAndGroupHint(in String l2Key, in String groupHint);

    void addNattKeepalivePacketFilter(int slot, in NattKeepalivePacketDataParcelable pkt);

    void addNattKeepalivePacketFilter(int slot, in NattKeepalivePacketDataParcelable pkt);

    void notifyPreconnectionComplete(boolean success);

}
 
}