Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Correct the logic in NetworkCapabilitiesTest" am: 457f91decf am: 885aad17b5 am: 008ba7a698 am: 063d3b25fc

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

Change-Id: If8264d339b93311240fce3875b41592efa336ad1
This commit is contained in:
Chiachang Wang
2021-03-23 14:40:19 +00:00
committed by Automerger Merge Worker
parent f58fbe4c2a 063d3b25fc
commit b1d9f48303
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/net/common/java/android/net/NetworkCapabilitiesTest.java
View File

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