Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename getVpnLockdownWhitelist to -Allowlist" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-02-15 08:29:55 +00:00
committed by Android (Google) Code Review
parent dcb2d95584 572d2ec85c
commit 9b25b89f8f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Connectivity/framework/src/android/net/ConnectivityManager.java
View File

@@ -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);
}

2
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -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()));
}