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

Commit ac212e98 authored by Xiao Ma's avatar Xiao Ma Committed by Gerrit Code Review
Browse files

Merge changes from topic... 

Merge changes from topic "revert-1353490-revert-1323251-ipv6_prov_loss_quirk_parcelable-DVBHZDYMHA-MDHWFKJABZ"

* changes:
  Freeze ipmemorystore-aidl-interfaces to version 9.
  Rename package name of IPv6ProvisioningLossQuirkParcelable.
  Revert "Revert "Add new network quirk parcelable in the NetworkAttributes""
parents eda2f56a 394d0c73

common/networkstackclient/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ aidl_interface { 
        "src/android/net/IIpMemoryStore.aidl",

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

        "src/android/net/ipmemorystore/**/*.aidl",

        // New AIDL classes should go into android.net.networkstack.aidl so they can be clearly

        // identified

        "src/android/net/networkstack/aidl/quirks/IPv6ProvisioningLossQuirkParcelable.aidl",

    ],

    backend: {

        java: {
@@ -50,6 +53,7 @@ aidl_interface { 
        "6",

        "7",

        "8",

        "9",

    ],

    visibility: [

        "//system/tools/aidl/build",
@@ -137,6 +141,7 @@ java_library { 
        "src/android/net/IpMemoryStoreClient.java",

        "src/android/net/ipmemorystore/**/*.java",

        "src/android/net/networkstack/**/*.java",

        "src/android/net/networkstack/aidl/quirks/**/*.java",

        "src/android/net/shared/**/*.java",

    ],

    static_libs: [

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

0 → 100644
+1 −0
Original line number Diff line number Diff line 
c34b6b37db3616fac1c4e705a04c6899772cc428

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

0 → 100644
+30 −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();

  oneway void delete(String l2Key, boolean needWipe, android.net.ipmemorystore.IOnStatusAndCountListener listener);

  oneway void deleteCluster(String cluster, boolean needWipe, android.net.ipmemorystore.IOnStatusAndCountListener listener);

}

common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/9/android/net/IIpMemoryStoreCallbacks.aidl

0 → 100644
+22 −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 IIpMemoryStoreCallbacks {

  oneway void onIpMemoryStoreFetched(in android.net.IIpMemoryStore ipMemoryStore);

}

common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/9/android/net/ipmemorystore/Blob.aidl

0 → 100644
+22 −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.ipmemorystore;

/* @hide */

parcelable Blob {

  byte[] data;

}