Merge "No-op cleanup" am: 21592b0d93 am: 866b9c4480
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1769285 Change-Id: Ib19a5d93e0b4e2f305a80ccf8841a36a5e7bda74
This commit is contained in:
@@ -10372,13 +10372,13 @@ public class ConnectivityServiceTest {
|
||||
}
|
||||
|
||||
private boolean areConnDiagCapsRedacted(NetworkCapabilities nc) {
|
||||
TestTransportInfo ti = (TestTransportInfo) nc.getTransportInfo();
|
||||
TestTransportInfo ti = getTestTransportInfo(nc);
|
||||
return nc.getUids() == null
|
||||
&& nc.getAdministratorUids().length == 0
|
||||
&& nc.getOwnerUid() == Process.INVALID_UID
|
||||
&& getTestTransportInfo(nc).locationRedacted
|
||||
&& getTestTransportInfo(nc).localMacAddressRedacted
|
||||
&& getTestTransportInfo(nc).settingsRedacted;
|
||||
&& ti.locationRedacted
|
||||
&& ti.localMacAddressRedacted
|
||||
&& ti.settingsRedacted;
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user