commit f6bd19640be1aa477b7009c9a328c27d6e4c772c
author Chiachang Wang <chiachangwang@google.com> Tue Mar 23 11:46:31 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 23 11:46:31 2021 +0000
tree f87ea9be059cca9a8449644d655c93cd652177de
parent e227632892ee45ae86f62e647b1922ff938d170e
parent dd29da510a1c1a6fd38c06f263d3835676099edb

Merge "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 f161e52..d3c3cfd 100644
--- a/tests/net/common/java/android/net/NetworkCapabilitiesTest.java
+++ b/tests/net/common/java/android/net/NetworkCapabilitiesTest.java
@@ -329,7 +329,8 @@
         if (isAtLeastS()) {
             netCap.setSubIds(Set.of(TEST_SUBID1, TEST_SUBID2));
             netCap.setUids(uids);
-        } else if (isAtLeastR()) {
+        }
+        if (isAtLeastR()) {
             netCap.setOwnerUid(123);
             netCap.setAdministratorUids(new int[] {5, 11});
         }