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

Merge "services.net: Use the new ModuleNetworkStackClient" am: c35936db0e am: 363ea3e26c

Browse Source 
Change-Id: Ia6826b1b4bd1079369ad19c8d6d73af53ad97049
This commit is contained in:
Automerger Merge Worker
2020-03-17 09:27:53 +00:00
parent 4fee098a5b 363ea3e26c
commit c85959f665
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.NetworkAttributesParcelable;
import android.net.ipmemorystore.Status;
import android.net.networkstack.ModuleNetworkStackClient;
import android.os.RemoteException;
import androidx.test.filters.SmallTest;
@@ -67,7 +68,7 @@ public class IpMemoryStoreTest {
@Mock
Context mMockContext;
@Mock
NetworkStackClient mNetworkStackClient;
ModuleNetworkStackClient mModuleNetworkStackClient;
@Mock
IIpMemoryStore mMockService;
@Mock
@@ -90,14 +91,14 @@ public class IpMemoryStoreTest {
((IIpMemoryStoreCallbacks) invocation.getArgument(0))
.onIpMemoryStoreFetched(mMockService);
return null;
}).when(mNetworkStackClient).fetchIpMemoryStore(any());
}).when(mModuleNetworkStackClient).fetchIpMemoryStore(any());
} else {
doNothing().when(mNetworkStackClient).fetchIpMemoryStore(mCbCaptor.capture());
doNothing().when(mModuleNetworkStackClient).fetchIpMemoryStore(mCbCaptor.capture());
}
mStore = new IpMemoryStore(mMockContext) {
@Override
protected NetworkStackClient getNetworkStackClient() {
return mNetworkStackClient;
protected ModuleNetworkStackClient getModuleNetworkStackClient(Context ctx) {
return mModuleNetworkStackClient;
}
};
}