Merge "Correct the logic in NetworkCapabilitiesTest"

2021-03-22 02:20:19 +00:00
parent afdb6a7347 628ada1d2d
commit 58f4cdf3b3
1 changed files with 2 additions and 1 deletions
--- a/tests/net/common/java/android/net/NetworkCapabilitiesTest.java
+++ b/tests/net/common/java/android/net/NetworkCapabilitiesTest.java
@@ -329,7 +329,8 @@ public class NetworkCapabilitiesTest {
        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});
        }