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

Commit 5a21dfc6 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:... 

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

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

Change-Id: I17015eaaf366f352252a052e61d45d5cbf392f5a
parents 52eda516 ddf72af9

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");

    }