Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a factoryReset method to IIpMemoryStore, and freeze api."

Browse Source
This commit is contained in:
Lorenzo Colitti
2019-05-20 12:09:02 +00:00
committed by Gerrit Code Review
parent 9e02ea4763 91dd063172
commit 51164c16aa
14 changed files with 66 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/NetworkStack/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreService.java
View File

@@ -410,6 +410,10 @@ public class IpMemoryStoreService extends IIpMemoryStore.Stub {
}); });
} }
@Override
public void factoryReset() {
}
/** Get db size threshold. */ /** Get db size threshold. */
@VisibleForTesting @VisibleForTesting
protected int getDbSizeThreshold() { protected int getDbSizeThreshold() {

1
services/net/Android.bp
View File

@@ -19,6 +19,7 @@ aidl_interface {
versions: [ versions: [
"1", "1",
"2", "2",
"3",
], ],
} }

10
services/net/aidl/ipmemorystore/3/android/net/IIpMemoryStore.aidl Normal file
View File

@@ -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();
}

4
services/net/aidl/ipmemorystore/3/android/net/IIpMemoryStoreCallbacks.aidl Normal file
View File

@@ -0,0 +1,4 @@
package android.net;
interface IIpMemoryStoreCallbacks {
oneway void onIpMemoryStoreFetched(in android.net.IIpMemoryStore ipMemoryStore);
}

4
services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/Blob.aidl Normal file
View File

@@ -0,0 +1,4 @@
package android.net.ipmemorystore;
parcelable Blob {
byte[] data;
}

4
services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl Normal file
View File

@@ -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);
}

4
services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl Normal file
View File

@@ -0,0 +1,4 @@
package android.net.ipmemorystore;
interface IOnL2KeyResponseListener {
oneway void onL2KeyResponse(in android.net.ipmemorystore.StatusParcelable status, in String l2Key);
}

4
services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl Normal file
View File

@@ -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);
}

4
services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl Normal file
View File

@@ -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);
}

4
services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnStatusListener.aidl Normal file
View File

@@ -0,0 +1,4 @@
package android.net.ipmemorystore;
interface IOnStatusListener {
oneway void onComplete(in android.net.ipmemorystore.StatusParcelable status);
}

8
services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/NetworkAttributesParcelable.aidl Normal file
View File

@@ -0,0 +1,8 @@
package android.net.ipmemorystore;
parcelable NetworkAttributesParcelable {
byte[] assignedV4Address;
long assignedV4AddressExpiry;
String groupHint;
android.net.ipmemorystore.Blob[] dnsAddresses;
int mtu;
}

6
services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl Normal file
View File

@@ -0,0 +1,6 @@
package android.net.ipmemorystore;
parcelable SameL3NetworkResponseParcelable {
String l2Key1;
String l2Key2;
float confidence;
}

4
services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/StatusParcelable.aidl Normal file
View File

@@ -0,0 +1,4 @@
package android.net.ipmemorystore;
parcelable StatusParcelable {
int resultCode;
}

5
services/net/java/android/net/IIpMemoryStore.aidl
View File

@@ -110,4 +110,9 @@ oneway interface IIpMemoryStore {
*/ */
void retrieveBlob(String l2Key, String clientId, String name, void retrieveBlob(String l2Key, String clientId, String name,
IOnBlobRetrievedListener listener); IOnBlobRetrievedListener listener);
/**
* Delete all data because a factory reset operation is in progress.
*/
void factoryReset();
} }