Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b79cddd6 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Rename getVpnLockdownWhitelist to -Allowlist" am: e322ecac am: 8cec61d8 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a6a2442a6dffe85c6d9f4783438b4a07865fd05
parents fe0e96c0 8cec61d8

packages/Connectivity/framework/src/android/net/ConnectivityManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

    }

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -7173,7 +7173,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) {