Commit 063d3b25 authored Mar 23, 2021 by Chiachang Wang Committed by Automerger Merge Worker Mar 23, 2021

Merge "Correct the logic in NetworkCapabilitiesTest" am: 457f91de am: 885aad17 am: 008ba7a6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649297

Change-Id: I3a99cab2dc0bdaa88a9671e1978c29cb40cd7a5b

tests/net/common/java/android/net/NetworkCapabilitiesTest.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -313,7 +313,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});
		}