diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-22 02:20:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-22 02:20:19 +0000 |
| commit | efbd8b39615a3f539798bf71aa509332bae11e27 (patch) | |
| tree | bcc5e097891e1ca947a811854392f52b8bdbd58f | |
| parent | 1077770f789404f9aa43ddc8ae5bc9a670164081 (diff) | |
| parent | f08d3d435930c50b8d31ae96344b75493dd476f3 (diff) | |
Merge "Correct the logic in NetworkCapabilitiesTest"
| -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}); } |