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

Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa am: 7dc61be0da am: b09793ab41

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

Change-Id: I1193382337088113bf64a636b0b70429d28f8be6
This commit is contained in:
Lorenzo Colitti
2021-04-14 03:00:32 +00:00
committed by Automerger Merge Worker
parent 386aeaa3d9 b09793ab41
commit f40b20ec1c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
framework/src/android/net/VpnTransportInfo.java
View File

@@ -22,6 +22,7 @@ import static android.net.NetworkCapabilities.REDACT_FOR_NETWORK_SETTINGS;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.net.NetworkCapabilities.RedactionType;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.text.TextUtils; import android.text.TextUtils;
@@ -45,7 +46,7 @@ public final class VpnTransportInfo implements TransportInfo, Parcelable {
public final String sessionId; public final String sessionId;
@Override @Override
public long getApplicableRedactions() { public @RedactionType long getApplicableRedactions() {
return REDACT_FOR_NETWORK_SETTINGS; return REDACT_FOR_NETWORK_SETTINGS;
} }
@@ -53,7 +54,7 @@ public final class VpnTransportInfo implements TransportInfo, Parcelable {
* Create a copy of a {@link VpnTransportInfo} with the sessionId redacted if necessary. * Create a copy of a {@link VpnTransportInfo} with the sessionId redacted if necessary.
*/ */
@NonNull @NonNull
public VpnTransportInfo makeCopy(long redactions) { public VpnTransportInfo makeCopy(@RedactionType long redactions) {
return new VpnTransportInfo(type, return new VpnTransportInfo(type,
((redactions & REDACT_FOR_NETWORK_SETTINGS) != 0) ? null : sessionId); ((redactions & REDACT_FOR_NETWORK_SETTINGS) != 0) ? null : sessionId);
} }