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

Rename getVpnLockdownWhitelist to -Allowlist

Browse Source 
Test: m
Bug: 173331190
Change-Id: Id02a37624655c4ff88744c9c57af9f2a17953667
This commit is contained in:
Lorenzo Colitti
2021-02-08 16:25:42 +09:00
parent d9334a47a0
commit 572d2ec85c
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 * @hide
*/ */
@Deprecated @Deprecated
public List<String> getVpnLockdownWhitelist(int userId) { public List<String> getVpnLockdownAllowlist(int userId) {
return getVpnManager().getVpnLockdownAllowlist(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)); Preconditions.checkCallAuthorization(isDeviceOwner(caller) || isProfileOwner(caller));
return mInjector.binderWithCleanCallingIdentity( return mInjector.binderWithCleanCallingIdentity(
() -> mInjector.getConnectivityManager().getVpnLockdownWhitelist( () -> mInjector.getConnectivityManager().getVpnLockdownAllowlist(
caller.getUserId())); caller.getUserId()));
} }