| commit | d9f660006ecce3fb3a43ce23ad6eb93491f7c4e8 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Mon Sep 14 23:42:34 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 14 23:42:34 2020 +0000 |
| tree | 7fe840d92f08ec02eb84d73bbd76225c34542870 | |
| parent | c2ccd90ab02afe0cda7e72e93b262b8054ffb89d [diff] | |
| parent | 2b4b4814aebf1721742fd3fb335478a98b6a902f [diff] |
Merge changes from topic "sep11" am: 9cf5f56268 am: e684d1e089 am: 2b4b4814ae Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195 Change-Id: I9b79dbf3e9983523db11599d8ae289b05aabf80c
diff --git a/core/java/android/net/apf/ApfCapabilities.java b/core/java/android/net/apf/ApfCapabilities.java index b1de74e..92c5432 100644 --- a/core/java/android/net/apf/ApfCapabilities.java +++ b/core/java/android/net/apf/ApfCapabilities.java
@@ -127,7 +127,7 @@ } /** - * @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() { return Resources.getSystem().getIntArray(R.array.config_apfEthTypeBlackList);
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index bc79a6a..aeb8fbb 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -6240,7 +6240,7 @@ final int vpnAppUid = nai.networkCapabilities.getOwnerUid(); // 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, - // 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. if (wasFiltering) { mPermissionMonitor.onVpnUidRangesRemoved(oldIface, ranges, vpnAppUid);