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

Merge changes from topic "services.net-wifi" into rvc-dev

Browse Source 
* changes:
  services.net: Add a static library needed by wifi module
  services.net: Use the new ModuleNetworkStackClient
This commit is contained in:
Roshan Pius
2020-03-13 22:39:09 +00:00
committed by Android (Google) Code Review
parent 417004a722 1378facba4
commit 468ca0fc4f
2 changed files with 9 additions and 24 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;
}
};
}