From 91dd063172e9c2e6f0323389f8184b548e0c24fb Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Sat, 18 May 2019 01:06:27 +0900 Subject: [PATCH] Add a factoryReset method to IIpMemoryStore, and freeze api. Currently unimplemented. Implementation will be in a future CL. Test: m Bug: 128499160 Change-Id: Ia11ecd33f528d01667b1baeb8671b7213a31eef5 --- .../ipmemorystore/IpMemoryStoreService.java | 4 ++++ services/net/Android.bp | 1 + .../ipmemorystore/3/android/net/IIpMemoryStore.aidl | 10 ++++++++++ .../3/android/net/IIpMemoryStoreCallbacks.aidl | 4 ++++ .../3/android/net/ipmemorystore/Blob.aidl | 4 ++++ .../net/ipmemorystore/IOnBlobRetrievedListener.aidl | 4 ++++ .../net/ipmemorystore/IOnL2KeyResponseListener.aidl | 4 ++++ .../IOnNetworkAttributesRetrievedListener.aidl | 4 ++++ .../IOnSameL3NetworkResponseListener.aidl | 4 ++++ .../3/android/net/ipmemorystore/IOnStatusListener.aidl | 4 ++++ .../net/ipmemorystore/NetworkAttributesParcelable.aidl | 8 ++++++++ .../ipmemorystore/SameL3NetworkResponseParcelable.aidl | 6 ++++++ .../3/android/net/ipmemorystore/StatusParcelable.aidl | 4 ++++ services/net/java/android/net/IIpMemoryStore.aidl | 5 +++++ 14 files changed, 66 insertions(+) create mode 100644 services/net/aidl/ipmemorystore/3/android/net/IIpMemoryStore.aidl create mode 100644 services/net/aidl/ipmemorystore/3/android/net/IIpMemoryStoreCallbacks.aidl create mode 100644 services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/Blob.aidl create mode 100644 services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl create mode 100644 services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl create mode 100644 services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl create mode 100644 services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl create mode 100644 services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnStatusListener.aidl create mode 100644 services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/NetworkAttributesParcelable.aidl create mode 100644 services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl create mode 100644 services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/StatusParcelable.aidl diff --git a/packages/NetworkStack/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreService.java b/packages/NetworkStack/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreService.java index 6a6bf83bd3c84..8312dfeb1a3b7 100644 --- a/packages/NetworkStack/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreService.java +++ b/packages/NetworkStack/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreService.java @@ -410,6 +410,10 @@ public class IpMemoryStoreService extends IIpMemoryStore.Stub { }); } + @Override + public void factoryReset() { + } + /** Get db size threshold. */ @VisibleForTesting protected int getDbSizeThreshold() { diff --git a/services/net/Android.bp b/services/net/Android.bp index ab11fe4df283c..4b0a27bbba80b 100644 --- a/services/net/Android.bp +++ b/services/net/Android.bp @@ -19,6 +19,7 @@ aidl_interface { versions: [ "1", "2", + "3", ], } diff --git a/services/net/aidl/ipmemorystore/3/android/net/IIpMemoryStore.aidl b/services/net/aidl/ipmemorystore/3/android/net/IIpMemoryStore.aidl new file mode 100644 index 0000000000000..1e688d0874de1 --- /dev/null +++ b/services/net/aidl/ipmemorystore/3/android/net/IIpMemoryStore.aidl @@ -0,0 +1,10 @@ +package android.net; +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(); +} diff --git a/services/net/aidl/ipmemorystore/3/android/net/IIpMemoryStoreCallbacks.aidl b/services/net/aidl/ipmemorystore/3/android/net/IIpMemoryStoreCallbacks.aidl new file mode 100644 index 0000000000000..cf02c26c2fe3f --- /dev/null +++ b/services/net/aidl/ipmemorystore/3/android/net/IIpMemoryStoreCallbacks.aidl @@ -0,0 +1,4 @@ +package android.net; +interface IIpMemoryStoreCallbacks { + oneway void onIpMemoryStoreFetched(in android.net.IIpMemoryStore ipMemoryStore); +} diff --git a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/Blob.aidl b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/Blob.aidl new file mode 100644 index 0000000000000..291dbef817e69 --- /dev/null +++ b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/Blob.aidl @@ -0,0 +1,4 @@ +package android.net.ipmemorystore; +parcelable Blob { + byte[] data; +} diff --git a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl new file mode 100644 index 0000000000000..52f40d49abd50 --- /dev/null +++ b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl @@ -0,0 +1,4 @@ +package android.net.ipmemorystore; +interface IOnBlobRetrievedListener { + oneway void onBlobRetrieved(in android.net.ipmemorystore.StatusParcelable status, in String l2Key, in String name, in android.net.ipmemorystore.Blob data); +} diff --git a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl new file mode 100644 index 0000000000000..785351435d734 --- /dev/null +++ b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl @@ -0,0 +1,4 @@ +package android.net.ipmemorystore; +interface IOnL2KeyResponseListener { + oneway void onL2KeyResponse(in android.net.ipmemorystore.StatusParcelable status, in String l2Key); +} diff --git a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl new file mode 100644 index 0000000000000..3dd2ae6e9babd --- /dev/null +++ b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl @@ -0,0 +1,4 @@ +package android.net.ipmemorystore; +interface IOnNetworkAttributesRetrievedListener { + oneway void onNetworkAttributesRetrieved(in android.net.ipmemorystore.StatusParcelable status, in String l2Key, in android.net.ipmemorystore.NetworkAttributesParcelable attributes); +} diff --git a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl new file mode 100644 index 0000000000000..46d4ecb9ed7c2 --- /dev/null +++ b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl @@ -0,0 +1,4 @@ +package android.net.ipmemorystore; +interface IOnSameL3NetworkResponseListener { + oneway void onSameL3NetworkResponse(in android.net.ipmemorystore.StatusParcelable status, in android.net.ipmemorystore.SameL3NetworkResponseParcelable response); +} diff --git a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnStatusListener.aidl b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnStatusListener.aidl new file mode 100644 index 0000000000000..54e654b80c9e9 --- /dev/null +++ b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnStatusListener.aidl @@ -0,0 +1,4 @@ +package android.net.ipmemorystore; +interface IOnStatusListener { + oneway void onComplete(in android.net.ipmemorystore.StatusParcelable status); +} diff --git a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/NetworkAttributesParcelable.aidl b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/NetworkAttributesParcelable.aidl new file mode 100644 index 0000000000000..9531ea3963fb9 --- /dev/null +++ b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/NetworkAttributesParcelable.aidl @@ -0,0 +1,8 @@ +package android.net.ipmemorystore; +parcelable NetworkAttributesParcelable { + byte[] assignedV4Address; + long assignedV4AddressExpiry; + String groupHint; + android.net.ipmemorystore.Blob[] dnsAddresses; + int mtu; +} diff --git a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl new file mode 100644 index 0000000000000..414272b49f1d8 --- /dev/null +++ b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl @@ -0,0 +1,6 @@ +package android.net.ipmemorystore; +parcelable SameL3NetworkResponseParcelable { + String l2Key1; + String l2Key2; + float confidence; +} diff --git a/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/StatusParcelable.aidl b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/StatusParcelable.aidl new file mode 100644 index 0000000000000..92c6779b5dc00 --- /dev/null +++ b/services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/StatusParcelable.aidl @@ -0,0 +1,4 @@ +package android.net.ipmemorystore; +parcelable StatusParcelable { + int resultCode; +} diff --git a/services/net/java/android/net/IIpMemoryStore.aidl b/services/net/java/android/net/IIpMemoryStore.aidl index 63feae65756fa..add221ae2e01e 100644 --- a/services/net/java/android/net/IIpMemoryStore.aidl +++ b/services/net/java/android/net/IIpMemoryStore.aidl @@ -110,4 +110,9 @@ oneway interface IIpMemoryStore { */ void retrieveBlob(String l2Key, String clientId, String name, IOnBlobRetrievedListener listener); + + /** + * Delete all data because a factory reset operation is in progress. + */ + void factoryReset(); }