Merge "No-op cleanup" am: 21592b0d93

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1769285

Change-Id: I4ea2b3bd3ab5f8c58aca5ca602e22a67f6f8e0d1
This commit is contained in:
Treehugger Robot
2021-07-16 16:25:17 +00:00
committed by Automerger Merge Worker

View File

@@ -10254,13 +10254,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