diff options
| author | Chiachang Wang <chiachangwang@google.com> | 2021-03-17 15:04:04 +0800 |
|---|---|---|
| committer | Chiachang Wang <chiachangwang@google.com> | 2021-03-18 13:37:31 +0000 |
| commit | f08d3d435930c50b8d31ae96344b75493dd476f3 (patch) | |
| tree | 47b59afb5d78ec1fbe943eb20d0eb56b69dfe689 | |
| parent | 1b6c0b7a302be30254f3db08e6f1311a49a7c9ad (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: I46f7dab5eb50cbdcd58aa4c58f43829d10b6c3d8
| -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 a7ad69564136..81f668f7b0f6 100644 --- a/tests/net/common/java/android/net/NetworkCapabilitiesTest.java +++ b/tests/net/common/java/android/net/NetworkCapabilitiesTest.java @@ -328,7 +328,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}); } |