Set attributionTag for noteOp(WRITE_SETTINGS) calls

Test: atest FrameworksNetTests
Bug: 136595429
Change-Id: I33f787644c44d7b0e5ce17a433820cfcd985cdfb
Exempt-From-Owner-Approval: Merge from AOSP
This commit is contained in:
Philip P. Moltmann
2020-03-24 15:57:49 -07:00
parent f2fa8eeed8
commit ddbcf5bf77
5 changed files with 84 additions and 28 deletions

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 mContext.getAttributionTag();
}
@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 {