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

Merge "Check null NetworkSpecifier before redacting" am: 435c4f7fc5 am: 9c5e87388d

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

Change-Id: I7e317ebb77d921c50e21a6a710e388e453cdfe62
This commit is contained in:
Junyu Lai
2021-06-25 15:54:20 +00:00
committed by Automerger Merge Worker
parent 637b44ffed 9c5e87388d
commit 6efa057bf5
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View File

@@ -537,8 +537,10 @@ public class ConnectivityManagerTest {
Objects.requireNonNull(mCm.getNetworkCapabilities(network)); Objects.requireNonNull(mCm.getNetworkCapabilities(network));
// Redact specifier of the capabilities of the snapshot before comparing since // Redact specifier of the capabilities of the snapshot before comparing since
// the result returned from getNetworkCapabilities always get redacted. // the result returned from getNetworkCapabilities always get redacted.
final NetworkSpecifier snapshotCapSpecifier =
snapshot.getNetworkCapabilities().getNetworkSpecifier();
final NetworkSpecifier redactedSnapshotCapSpecifier = final NetworkSpecifier redactedSnapshotCapSpecifier =
snapshot.getNetworkCapabilities().getNetworkSpecifier().redact(); snapshotCapSpecifier == null ? null : snapshotCapSpecifier.redact();
assertEquals("", caps.describeImmutableDifferences( assertEquals("", caps.describeImmutableDifferences(
snapshot.getNetworkCapabilities() snapshot.getNetworkCapabilities()
.setNetworkSpecifier(redactedSnapshotCapSpecifier))); .setNetworkSpecifier(redactedSnapshotCapSpecifier)));