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

Commit b289683a authored by Chalard Jean's avatar Chalard Jean
Browse files

Rename groupHint to cluster. 

Bug: 146460486
Test: atest android.net.IpMemoryStoreTest
Test: atest com.android.server.connectivity.ipmemorystore.IpMemoryStoreServiceTest
Change-Id: I805733e201aa1286477cfac589cdf4ac18bb7e2b
parent 90847681

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

+8 −8
Original line number Diff line number Diff line
@@ -27,17 +27,17 @@ public class Layer2Information { 
    @Nullable

    public final String mL2Key;

    @Nullable

    public final String mGroupHint;

    public final String mCluster;

    @Nullable

    public final MacAddress mBssid;



    /**

     * Create a Layer2Information with the specified configuration.

     */

    public Layer2Information(@Nullable final String l2Key, @Nullable final String groupHint,

    public Layer2Information(@Nullable final String l2Key, @Nullable final String cluster,

            @Nullable final MacAddress bssid) {

        mL2Key = l2Key;

        mGroupHint = groupHint;

        mCluster = cluster;

        mBssid = bssid;

    }
@@ -45,7 +45,7 @@ public class Layer2Information { 
    public String toString() {

        StringBuffer str = new StringBuffer();

        str.append("L2Key: ").append(mL2Key);

        str.append(", GroupHint: ").append(mGroupHint);

        str.append(", Cluster: ").append(mCluster);

        str.append(", bssid: ").append(mBssid);

        return str.toString();

    }
@@ -56,7 +56,7 @@ public class Layer2Information { 
    public Layer2InformationParcelable toStableParcelable() {

        final Layer2InformationParcelable p = new Layer2InformationParcelable();

        p.l2Key = mL2Key;

        p.groupHint = mGroupHint;

        p.cluster = mCluster;

        p.bssid = mBssid;

        return p;

    }
@@ -67,7 +67,7 @@ public class Layer2Information { 
     */

    public static Layer2Information fromStableParcelable(Layer2InformationParcelable p) {

        if (p == null) return null;

        return new Layer2Information(p.l2Key, p.groupHint, p.bssid);

        return new Layer2Information(p.l2Key, p.cluster, p.bssid);

    }



    @Override
@@ -75,12 +75,12 @@ public class Layer2Information { 
        if (!(obj instanceof Layer2Information)) return false;

        final Layer2Information other = (Layer2Information) obj;

        return Objects.equals(mL2Key, other.mL2Key)

                && Objects.equals(mGroupHint, other.mGroupHint)

                && Objects.equals(mCluster, other.mCluster)

                && Objects.equals(mBssid, other.mBssid);

    }



    @Override

    public int hashCode() {

        return Objects.hash(mL2Key, mGroupHint, mBssid);

        return Objects.hash(mL2Key, mCluster, mBssid);

    }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ public class ProvisioningConfiguration { 
        }



        /**

         * Specify the L2 information(bssid, l2key and groupHint) that the IpClient should use.

         * Specify the L2 information(bssid, l2key and cluster) that the IpClient should use.

         */

        public Builder withLayer2Information(Layer2Information layer2Info) {

            mConfig.mLayer2Info = layer2Info;

common/networkstackclient/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ aidl_interface { 
        "3",

        "4",

        "5",

        "6",

    ],

    visibility: [

        "//system/tools/aidl/build",
@@ -103,6 +104,7 @@ aidl_interface { 
        "4",

        "5",

        "6",

        "7",

    ],

    // TODO: have tethering depend on networkstack-client and set visibility to private

    visibility: [
@@ -121,7 +123,7 @@ java_library { 
        "src/android/net/networkstack/**/*.java",

    ],

    static_libs: [

        "ipmemorystore-aidl-interfaces-V5-java",

        "ipmemorystore-aidl-interfaces-java",

        "networkstack-aidl-interfaces-java",

    ],

    visibility: [

common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/6/.hash

0 → 100644
+1 −0
Original line number Diff line number Diff line 
995043fb16c363208cbdb99c48bb775040d1f169

common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/6/android/net/IIpMemoryStore.aidl

0 → 100644
+28 −0
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// edit this file. It looks like you are doing that because you have modified

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// from an interface or a field from a parcelable and it broke the build. That

// breakage is intended.

//

// You must not make a backward incompatible changes to the AIDL files built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.net;

/* @hide */

interface IIpMemoryStore {

  oneway void storeNetworkAttributes(String l2Key, in android.net.ipmemorystore.NetworkAttributesParcelable attributes, android.net.ipmemorystore.IOnStatusListener listener);

  oneway void storeBlob(String l2Key, String clientId, String name, in android.net.ipmemorystore.Blob data, android.net.ipmemorystore.IOnStatusListener listener);

  oneway void findL2Key(in android.net.ipmemorystore.NetworkAttributesParcelable attributes, android.net.ipmemorystore.IOnL2KeyResponseListener listener);

  oneway void isSameNetwork(String l2Key1, String l2Key2, android.net.ipmemorystore.IOnSameL3NetworkResponseListener listener);

  oneway void retrieveNetworkAttributes(String l2Key, android.net.ipmemorystore.IOnNetworkAttributesRetrievedListener listener);

  oneway void retrieveBlob(String l2Key, String clientId, String name, android.net.ipmemorystore.IOnBlobRetrievedListener listener);

  oneway void factoryReset();

}