Do not deduce VCN capability if Builder is derived from request

If the caller constructed the builder from a request, it means
the user might explicitly want the capabilities from the request.
Thus, the NOT_VCN_MANAGED capabilities should not be touched
later.

Test: TH
Fix: 185876442
Change-Id: I92037cc8547fb72de12d6b6402f060f6c98e1853
This commit is contained in:
junyulai
2021-04-21 18:47:37 +08:00
parent 6cab3df7dc
commit 561a7467c8

View File

@@ -220,6 +220,10 @@ public class NetworkRequest implements Parcelable {
public Builder(@NonNull final NetworkRequest request) {
Objects.requireNonNull(request);
mNetworkCapabilities = request.networkCapabilities;
// If the caller constructed the builder from a request, it means the user
// might explicitly want the capabilities from the request. Thus, the NOT_VCN_MANAGED
// capabilities should not be touched later.
mModifiedNotVcnManaged = true;
}
/**