commit b948cc3ba0f8f6a224e0894499c418128a248837
author Chiachang Wang <chiachangwang@google.com> Tue Mar 23 12:10:57 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 23 12:10:57 2021 +0000
tree f87ea9be059cca9a8449644d655c93cd652177de
parent 5898f562ed7ba6dd4fe10b07b89e24a29f1ed73f
parent 06238861b5c9c2a883140715701cbd3e0f6df87a

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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649297

Change-Id: I224e3c120ac07677d80396247f5b9e74c1bfd1a4

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});
         }