diff options
| author | 2021-02-08 16:25:42 +0900 | |
|---|---|---|
| committer | 2021-02-15 16:10:14 +0900 | |
| commit | 572d2ec85c0cef66a7a44c15cc54252bb5fb65ba (patch) | |
| tree | eefa81745b461232a48fe947f02002c8fdd4a844 | |
| parent | d9334a47a06be268ecc63e6f7fec186e7b821d54 (diff) | |
Rename getVpnLockdownWhitelist to -Allowlist
Test: m
Bug: 173331190
Change-Id: Id02a37624655c4ff88744c9c57af9f2a17953667
| -rw-r--r-- | packages/Connectivity/framework/src/android/net/ConnectivityManager.java | 2 | ||||
| -rw-r--r-- | services/devicepolicy/java/com/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 ef02a7e7b99b..92d7bf06aa9e 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 b063e6727f5b..9a692be7f959 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())); } |