From 572d2ec85c0cef66a7a44c15cc54252bb5fb65ba Mon Sep 17 00:00:00 2001
From: Lorenzo Colitti <lorenzo@google.com>
Date: Mon, 8 Feb 2021 16:25:42 +0900
Subject: [PATCH] Rename getVpnLockdownWhitelist to -Allowlist

Test: m
Bug: 173331190
Change-Id: Id02a37624655c4ff88744c9c57af9f2a17953667
---
 .../framework/src/android/net/ConnectivityManager.java          | 2 +-
 .../android/server/devicepolicy/DevicePolicyManagerService.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/Connectivity/framework/src/android/net/ConnectivityManager.java b/packages/Connectivity/framework/src/android/net/ConnectivityManager.java
index ef02a7e7b99b7..92d7bf06aa9ea 100644
--- a/packages/Connectivity/framework/src/android/net/ConnectivityManager.java
+++ b/packages/Connectivity/framework/src/android/net/ConnectivityManager.java
@@ -1117,7 +1117,7 @@ public class ConnectivityManager {
      * @hide
      */
     @Deprecated
-    public List<String> getVpnLockdownWhitelist(int userId) {
+    public List<String> getVpnLockdownAllowlist(int userId) {
         return getVpnManager().getVpnLockdownAllowlist(userId);
     }
 
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index b063e6727f5b9..9a692be7f959f 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -6372,7 +6372,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
         Preconditions.checkCallAuthorization(isDeviceOwner(caller) || isProfileOwner(caller));
 
         return mInjector.binderWithCleanCallingIdentity(
-                () -> mInjector.getConnectivityManager().getVpnLockdownWhitelist(
+                () -> mInjector.getConnectivityManager().getVpnLockdownAllowlist(
                         caller.getUserId()));
     }