Merge "Address API review feedback" into sc-dev

This commit is contained in:
Chiachang Wang
2021-04-23 00:30:51 +00:00
committed by Android (Google) Code Review
10 changed files with 51 additions and 36 deletions

View File

@@ -379,7 +379,7 @@ public class ConnectivityManagerTest {
eq(testPkgName), eq(testAttributionTag));
reset(mService);
manager.registerDefaultNetworkCallbackAsUid(42, callback, handler);
manager.registerDefaultNetworkCallbackForUid(42, callback, handler);
verify(mService).requestNetwork(eq(42), eq(null),
eq(TRACK_DEFAULT.ordinal()), any(), anyInt(), any(), eq(TYPE_NONE), anyInt(),
eq(testPkgName), eq(testAttributionTag));

View File

@@ -63,6 +63,6 @@ public class VpnTransportInfoTest {
assertEquals(v31, v32);
assertEquals(v11.hashCode(), v13.hashCode());
assertEquals(REDACT_FOR_NETWORK_SETTINGS, v32.getApplicableRedactions());
assertEquals(session1, v15.makeCopy(REDACT_NONE).sessionId);
assertEquals(session1, v15.makeCopy(REDACT_NONE).getSessionId());
}
}