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

Merge "Set attributionTag for noteOp(WRITE_SETTINGS) calls" am: da8697a48b am: 7b3866f284

Browse Source 
Change-Id: I099944752fc3006c1e98750dd46dbebf5e50789f
This commit is contained in:
Philip P. Moltmann
2020-04-22 15:19:14 +00:00
committed by Automerger Merge Worker
parent 9442426f95 7b3866f284
commit 84091e184a
5 changed files with 84 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -3049,6 +3049,13 @@ public class ConnectivityServiceTest {
assertNoCallbacks(cEmpty1, cEmpty2, cEmpty3, cEmpty4, cFoo, cBar);
}
/**
* @return the context's attribution tag
*/
private String getAttributionTag() {
return null;
}
@Test
public void testInvalidNetworkSpecifier() {
assertThrows(IllegalArgumentException.class, () -> {
@@ -3061,7 +3068,8 @@ public class ConnectivityServiceTest {
networkCapabilities.addTransportType(TRANSPORT_WIFI)
.setNetworkSpecifier(new MatchAllNetworkSpecifier());
mService.requestNetwork(networkCapabilities, null, 0, null,
ConnectivityManager.TYPE_WIFI, mContext.getPackageName());
ConnectivityManager.TYPE_WIFI, mContext.getPackageName(),
getAttributionTag());
});
class NonParcelableSpecifier extends NetworkSpecifier {