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

Merge changes from topic "sep11" am: 9cf5f56268

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

Change-Id: I4fd71573b4301e5473d44517a72d73858b3928c8
This commit is contained in:
Jeff Sharkey
2020-09-14 22:36:51 +00:00
committed by Automerger Merge Worker
parent c09a299d85 9cf5f56268
commit e684d1e089
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/apf/ApfCapabilities.java
View File

@@ -127,7 +127,7 @@ public final class ApfCapabilities implements Parcelable {
} }
/** /**
* @return An array of blacklisted EtherType, packets with EtherTypes within it will be dropped. * @return An array of denylisted EtherType, packets with EtherTypes within it will be dropped.
*/ */
public static @NonNull int[] getApfEtherTypeBlackList() { public static @NonNull int[] getApfEtherTypeBlackList() {
return Resources.getSystem().getIntArray(R.array.config_apfEthTypeBlackList); return Resources.getSystem().getIntArray(R.array.config_apfEthTypeBlackList);

2
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -6240,7 +6240,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
final int vpnAppUid = nai.networkCapabilities.getOwnerUid(); final int vpnAppUid = nai.networkCapabilities.getOwnerUid();
// TODO: this create a window of opportunity for apps to receive traffic between the time // TODO: this create a window of opportunity for apps to receive traffic between the time
// when the old rules are removed and the time when new rules are added. To fix this, // when the old rules are removed and the time when new rules are added. To fix this,
// make eBPF support two whitelisted interfaces so here new rules can be added before the // make eBPF support two allowlisted interfaces so here new rules can be added before the
// old rules are being removed. // old rules are being removed.
if (wasFiltering) { if (wasFiltering) {
mPermissionMonitor.onVpnUidRangesRemoved(oldIface, ranges, vpnAppUid); mPermissionMonitor.onVpnUidRangesRemoved(oldIface, ranges, vpnAppUid);