diff options
| author | Chiachang Wang <chiachangwang@google.com> | 2021-03-23 11:46:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-23 11:46:31 +0000 |
| commit | 457f91decf3b707dfe295ca51484d4ccd73aacac (patch) | |
| tree | b1b51a7c25dc9736af952c8080bfe4e0a1d3b384 /tests | |
| parent | 82cd5382b7b971036e4028051a1bb4305cea5c2b (diff) | |
| parent | 5a06d5b958c634501f7ec61e5efbfca453ca3d9a (diff) | |
Merge "Correct the logic in NetworkCapabilitiesTest"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/net/common/java/android/net/NetworkCapabilitiesTest.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/net/common/java/android/net/NetworkCapabilitiesTest.java b/tests/net/common/java/android/net/NetworkCapabilitiesTest.java index f161e52c2fd5..d3c3cfda147d 100644 --- 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}); } |