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

Merge "Separate test into reasonable multiple tests" am: 26a7e61417

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793478

Change-Id: I9193477c6744c6f9a1f7e7e14e0c98e4348b262d
This commit is contained in:
Chiachang Wang
2021-09-07 03:01:39 +00:00
committed by Automerger Merge Worker
parent 2fe543353b 26a7e61417
commit 33076dddff
2 changed files with 87 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/src/android/net/NetworkCapabilities.java
View File

@@ -852,7 +852,7 @@ public final class NetworkCapabilities implements Parcelable {
// SubIds are only allowed for Test Networks that only declare TRANSPORT_TEST.
setSubscriptionIds(originalSubIds);
} else {
// If the test transport is restricted, then it may declare any transport.
// If the test network is restricted, then it may declare any transport.
mTransportTypes = (originalTransportTypes | (1 << TRANSPORT_TEST));
}
mNetworkCapabilities = originalCapabilities & TEST_NETWORKS_ALLOWED_CAPABILITIES;