Merge "Correct the logic in NetworkCapabilitiesTest" am: 2848cdf348 am: 06238861b5 am: b948cc3ba0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649297 Change-Id: I3a99cab2dc0bdaa88a9671e1978c29cb40cd7a5b
2021-03-23 14:09:30 +00:00
parent 60721636cd b948cc3ba0
commit a391ad837f
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
@@ -313,7 +313,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});
        }