summaryrefslogtreecommitdiffstats
path: root/services/tests/servicestests/src
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2015-04-21 07:39:02 +0000
committerAndroid Partner Code Review <android-gerrit-partner@google.com>2015-04-21 07:39:02 +0000
commit6332b7e3bc351ce0ccde61b2ebab81bdccc09bbd (patch)
treeb44e98f39a54027522fb393b051ab0aa2a595c1a /services/tests/servicestests/src
parent83cda0057a83521642e99e538daeba2f8544da15 (diff)
parent3e979321a5d96b9e2688f67ef0f936602c0f7e5a (diff)
downloadframeworks_base-6332b7e3bc351ce0ccde61b2ebab81bdccc09bbd.zip
frameworks_base-6332b7e3bc351ce0ccde61b2ebab81bdccc09bbd.tar.gz
frameworks_base-6332b7e3bc351ce0ccde61b2ebab81bdccc09bbd.tar.bz2
Merge "Set the secs field in the BOOTP header." into m-wireless-dev
Diffstat (limited to 'services/tests/servicestests/src')
-rw-r--r--services/tests/servicestests/src/android/net/dhcp/DhcpPacketTest.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/tests/servicestests/src/android/net/dhcp/DhcpPacketTest.java b/services/tests/servicestests/src/android/net/dhcp/DhcpPacketTest.java
index 2658937..4f7c7ec 100644
--- a/services/tests/servicestests/src/android/net/dhcp/DhcpPacketTest.java
+++ b/services/tests/servicestests/src/android/net/dhcp/DhcpPacketTest.java
@@ -41,7 +41,8 @@ public class DhcpPacketTest extends TestCase {
private byte[] mDomainBytes, mVendorInfoBytes;
public TestDhcpPacket(byte type, byte[] domainBytes, byte[] vendorInfoBytes) {
- super(0xdeadbeef, INADDR_ANY, CLIENT_ADDR, INADDR_ANY, INADDR_ANY, CLIENT_MAC, true);
+ super(0xdeadbeef, (short) 0, INADDR_ANY, CLIENT_ADDR, INADDR_ANY, INADDR_ANY,
+ CLIENT_MAC, true);
mType = type;
mDomainBytes = domainBytes;
mVendorInfoBytes = vendorInfoBytes;