Merge "Correct the logic in NetworkCapabilitiesTest" am: 2848cdf348

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

Change-Id: I32bc9ee2db0b192513f782455a91d7336875a039
This commit is contained in:
Chiachang Wang 2021-03-23 12:07:47 +00:00 • committed by Automerger Merge Worker
commit 06238861b5

View file

@ -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});
}