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

Commit 46838701 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

Merge "Add a factoryReset method to IIpMemoryStore, and freeze api." into qt-dev 

am: 39af0412

Change-Id: If20ca5ff71659d6e83a4bbd6236394e7b02f677a
parents f9271218 39af0412

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

+4 −0
Original line number Diff line number Diff line
@@ -410,6 +410,10 @@ public class IpMemoryStoreService extends IIpMemoryStore.Stub { 
        });

    }



    @Override

    public void factoryReset() {

    }



    /** Get db size threshold. */

    @VisibleForTesting

    protected int getDbSizeThreshold() {

services/net/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ aidl_interface { 
    versions: [

        "1",

        "2",

        "3",

    ],

}

services/net/aidl/ipmemorystore/3/android/net/IIpMemoryStore.aidl

0 → 100644
+10 −0
Original line number Diff line number Diff line 
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();

}

services/net/aidl/ipmemorystore/3/android/net/IIpMemoryStoreCallbacks.aidl

0 → 100644
+4 −0
Original line number Diff line number Diff line 
package android.net;

interface IIpMemoryStoreCallbacks {

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

}

services/net/aidl/ipmemorystore/3/android/net/ipmemorystore/Blob.aidl

0 → 100644
+4 −0
Original line number Diff line number Diff line 
package android.net.ipmemorystore;

parcelable Blob {

  byte[] data;

}