commit 3f603fae136148d82351d7b3420ef09b5010af16
author Chiachang Wang <chiachangwang@google.com> Mon Mar 22 06:26:33 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 22 06:26:33 2021 +0000
tree 82324f19e50f5493fc2ba1e3459f2558f3a72d90
parent 58f4cdf3b3548fb0f0f16220bfb04f6a64571dcf
parent f2b0b41764fa8e536637b37176471c9cd683ca38

Merge "Revert "Correct the logic in NetworkCapabilitiesTest""

tests/net/common/java/android/net/NetworkCapabilitiesTest.java

diff --git a/tests/net/common/java/android/net/NetworkCapabilitiesTest.java b/tests/net/common/java/android/net/NetworkCapabilitiesTest.java
index 9b6d641..d40b88c 100644
--- a/tests/net/common/java/android/net/NetworkCapabilitiesTest.java
+++ b/tests/net/common/java/android/net/NetworkCapabilitiesTest.java
@@ -329,8 +329,7 @@
         if (isAtLeastS()) {
             netCap.setSubIds(Set.of(TEST_SUBID1, TEST_SUBID2));
             netCap.setUids(uids);
-        }
-        if (isAtLeastR()) {
+        } else if (isAtLeastR()) {
             netCap.setOwnerUid(123);
             netCap.setAdministratorUids(new int[] {5, 11});
         }