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

Commit b677d581 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Rename getVpnLockdownWhitelist to -Allowlist" into sc-dev am: 9b25b89f 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b47ef6937935b9ea6be6f0233c8b3e8c0cf2cb8
parents 272688ec 9b25b89f

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















    }