commit 4e846daeae1145a3478de789d40bc514fee7d777
author Lorenzo Colitti <lorenzo@google.com> Mon Feb 15 12:04:24 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 15 12:04:24 2021 +0000
tree 784dfe7a17e1c20c33aac7136e9510478e5631cd
parent 83e1e619b3835fb8e8f1e7a3be2fe542b0b8c885
parent b6bd8a54a11e5ce78eaca894f08b7d3c6f28dbc6

Merge "Rename getVpnLockdownWhitelist to -Allowlist"

framework/src/android/net/ConnectivityManager.java

diff --git a/framework/src/android/net/ConnectivityManager.java b/framework/src/android/net/ConnectivityManager.java
index 27386bc..4213f8a 100644
--- a/framework/src/android/net/ConnectivityManager.java
+++ b/framework/src/android/net/ConnectivityManager.java
@@ -1117,7 +1117,7 @@
      * @hide
      */
     @Deprecated
-    public List<String> getVpnLockdownWhitelist(int userId) {
+    public List<String> getVpnLockdownAllowlist(int userId) {
         return getVpnManager().getVpnLockdownAllowlist(userId);
     }