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

Commit ddf72af9 authored by Robin Lee's avatar Robin Lee Committed by android-build-merger
Browse files

Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 6e79d7d5 

am: 8472612d

* commit '8472612d':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: Icfb579f2fd8f0496341888c91d129ea461c40236
parents 06d2d30d 8472612d

tests/telephonytests/src/com/android/internal/telephony/mocks/ConnectivityServiceMock.java

+1 −1
Original line number Diff line number Diff line
@@ -715,7 +715,7 @@ public class ConnectivityServiceMock extends IConnectivityManager.Stub 
    }



    @Override

    public boolean setAlwaysOnVpnPackage(int userId, String packageName) {

    public boolean setAlwaysOnVpnPackage(int userId, String packageName, boolean lockdownEnabled) {

        throw new RuntimeException("not implemented");

    }