LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

services.net: Use the new ModuleNetworkStackClient

Browse Source 
Use the new ModuleNetworkStackClient to retrieve instances IpMemoryStore
& IpClient.

Bug: 145825329
Test: Compiles
Change-Id: I065525fdbd64b9509ef0f47bb35954d267c65fd2
Merged-In: I065525fdbd64b9509ef0f47bb35954d267c65fd2
This commit is contained in:
Roshan Pius
2020-02-20 21:47:01 -08:00
parent 08679046fe
commit e072ca8b35
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/net/java/android/net/IpMemoryStoreTest.java
View File

@@ -35,6 +35,7 @@ import android.net.ipmemorystore.IOnStatusListener;
import android.net.ipmemorystore.NetworkAttributes; import android.net.ipmemorystore.NetworkAttributes;
import android.net.ipmemorystore.NetworkAttributesParcelable; import android.net.ipmemorystore.NetworkAttributesParcelable;
import android.net.ipmemorystore.Status; import android.net.ipmemorystore.Status;
import android.net.networkstack.ModuleNetworkStackClient;
import android.os.RemoteException; import android.os.RemoteException;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;
@@ -67,7 +68,7 @@ public class IpMemoryStoreTest {
@Mock @Mock
Context mMockContext; Context mMockContext;
@Mock @Mock
NetworkStackClient mNetworkStackClient; ModuleNetworkStackClient mModuleNetworkStackClient;
@Mock @Mock
IIpMemoryStore mMockService; IIpMemoryStore mMockService;
@Mock @Mock
@@ -90,14 +91,14 @@ public class IpMemoryStoreTest {
((IIpMemoryStoreCallbacks) invocation.getArgument(0)) ((IIpMemoryStoreCallbacks) invocation.getArgument(0))
.onIpMemoryStoreFetched(mMockService); .onIpMemoryStoreFetched(mMockService);
return null; return null;
}).when(mNetworkStackClient).fetchIpMemoryStore(any()); }).when(mModuleNetworkStackClient).fetchIpMemoryStore(any());
} else { } else {
doNothing().when(mNetworkStackClient).fetchIpMemoryStore(mCbCaptor.capture()); doNothing().when(mModuleNetworkStackClient).fetchIpMemoryStore(mCbCaptor.capture());
} }
mStore = new IpMemoryStore(mMockContext) { mStore = new IpMemoryStore(mMockContext) {
@Override @Override
protected NetworkStackClient getNetworkStackClient() { protected ModuleNetworkStackClient getModuleNetworkStackClient(Context ctx) {
return mNetworkStackClient; return mModuleNetworkStackClient;
} }
}; };
} }