LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Change-Id: I224e3c120ac07677d80396247f5b9e74c1bfd1a4
This commit is contained in:
Chiachang Wang
2021-03-23 12:10:57 +00:00
committed by Automerger Merge Worker
parent 5898f562ed 06238861b5
commit b948cc3ba0
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

@@ -329,7 +329,8 @@ public class NetworkCapabilitiesTest {
if (isAtLeastS()) { if (isAtLeastS()) {
netCap.setSubIds(Set.of(TEST_SUBID1, TEST_SUBID2)); netCap.setSubIds(Set.of(TEST_SUBID1, TEST_SUBID2));
netCap.setUids(uids); netCap.setUids(uids);
} else if (isAtLeastR()) { }
if (isAtLeastR()) {
netCap.setOwnerUid(123); netCap.setOwnerUid(123);
netCap.setAdministratorUids(new int[] {5, 11}); netCap.setAdministratorUids(new int[] {5, 11});
} }