Merge "Update mock with new methods." am: eec2c9d7bf am: 1623f2741f (aff695b2) · Commits · e / os / android_frameworks_opt_telephony

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

+13 −1

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ import com.android.server.connectivity.NetworkAgentInfo;
		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.HashMap;
		import java.util.List;

		/**
		* @hide
		@@ -656,7 +657,8 @@ public class ConnectivityServiceMock extends IConnectivityManager.Stub
		}

		@Override
		public boolean setAlwaysOnVpnPackage(int userId, String packageName, boolean lockdownEnabled) {
		public boolean setAlwaysOnVpnPackage(int userId, String packageName, boolean lockdownEnabled,
		List<String> lockdownWhitelist) {
		throw new RuntimeException("not implemented");
		}

		@@ -665,6 +667,16 @@ public class ConnectivityServiceMock extends IConnectivityManager.Stub
		throw new RuntimeException("not implemented");
		}

		@Override
		public boolean isVpnLockdownEnabled(int userId) {
		throw new RuntimeException("not implemented");
		}

		@Override
		public List<String> getVpnLockdownWhitelist(int userId) {
		throw new RuntimeException("not implemented");
		}

		@Override
		public int checkMobileProvisioning(int suggestedTimeOutMs) {
		throw new RuntimeException("not implemented");