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

Merge "Rename getVpnLockdownWhitelist to -Allowlist" am: e322ecac2c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580383

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1aca516555b1aea484aa962d1f538b3ae0eb9d4d
This commit is contained in:
Lorenzo Colitti
2021-02-15 12:21:40 +00:00
committed by Automerger Merge Worker
parent 0b263af1fe e322ecac2c
commit 8cec61d86f
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

@@ -7158,7 +7158,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
final int userId = mInjector.userHandleGetCallingUserId();
return mInjector.binderWithCleanCallingIdentity(
() -> mInjector.getConnectivityManager().getVpnLockdownWhitelist(userId));
() -> mInjector.getConnectivityManager().getVpnLockdownAllowlist(userId));
}
private void forceWipeDeviceNoLock(boolean wipeExtRequested, String reason, boolean wipeEuicc) {