From f08d3d435930c50b8d31ae96344b75493dd476f3 Mon Sep 17 00:00:00 2001 From: Chiachang Wang Date: Wed, 17 Mar 2021 15:04:04 +0800 Subject: 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 --- tests/net/common/java/android/net/NetworkCapabilitiesTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests') 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}); } -- cgit v1.2.3