diff options
| author | Chiachang Wang <chiachangwang@google.com> | 2021-03-17 15:04:04 +0800 |
|---|---|---|
| committer | Chiachang Wang <chiachangwang@google.com> | 2021-03-23 15:16:39 +0800 |
| commit | 5a06d5b958c634501f7ec61e5efbfca453ca3d9a (patch) | |
| tree | f5ee18cbe12dc404e1cd92e86b3a266b663bea37 /tests | |
| parent | 6d7c90717a639b36e452097095af597810e64c6d (diff) | |
Correct the logic in NetworkCapabilitiesTest
setOwnerUid() and setAdministratorUids() should run in R+.
Previous logic will skip them in S+. Correct the logic to
what it should be.
Bug: 172183305
Test: atest android.net.NetworkCapabilitiesTest
Change-Id: Ic983aa00f930fb26350469ef093bcba2990433a4
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 d40b88ca599f..9b6d641223bb 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}); } |