commit 435c4f7fc5b80db29e698fe420d5416fdd5262af
author Junyu Lai <junyulai@google.com> Fri Jun 25 15:27:55 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 25 15:27:55 2021 +0000
tree 3f31e07eaccc6ab4ff5a8423ff464ea7e976e22a
parent c577c271ba4027cbdf74bfbbb11338025af283a5
parent 144b6c742a6cd699413153a1d91c0c6fd89f960a

Merge "Check null NetworkSpecifier before redacting"

tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java

diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index 3220565..24ecf7d 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -536,8 +536,10 @@
                     Objects.requireNonNull(mCm.getNetworkCapabilities(network));
             // Redact specifier of the capabilities of the snapshot before comparing since
             // the result returned from getNetworkCapabilities always get redacted.
+            final NetworkSpecifier snapshotCapSpecifier =
+                    snapshot.getNetworkCapabilities().getNetworkSpecifier();
             final NetworkSpecifier redactedSnapshotCapSpecifier =
-                    snapshot.getNetworkCapabilities().getNetworkSpecifier().redact();
+                    snapshotCapSpecifier == null ? null : snapshotCapSpecifier.redact();
             assertEquals("", caps.describeImmutableDifferences(
                     snapshot.getNetworkCapabilities()
                             .setNetworkSpecifier(redactedSnapshotCapSpecifier)));