Merge "Revert "Correct the logic in NetworkCapabilitiesTest""

2021-03-22 06:26:33 +00:00
parent e05e71e820 a5572f4656
commit 2ae123ec47
1 changed files with 1 additions and 2 deletions
--- a/tests/net/common/java/android/net/NetworkCapabilitiesTest.java
+++ b/tests/net/common/java/android/net/NetworkCapabilitiesTest.java
@@ -329,8 +329,7 @@ public class NetworkCapabilitiesTest {
        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});
        }