diff options
author | Etan Cohen <etancohen@google.com> | 2015-04-24 14:03:28 -0700 |
---|---|---|
committer | Etan Cohen <etancohen@google.com> | 2015-04-24 14:03:28 -0700 |
commit | 644f41368f9eddd475fa9c5dddc7ceac5722a3a8 (patch) | |
tree | 7debb618bbe004bd6e710e758a7302715e96a3f2 /services/tests | |
parent | a6e5ff899a7cc300985c09e57a2e3b4f5aa170d3 (diff) | |
parent | 4cb5d80abeb88918534e90c2a7b58cdcba22ac77 (diff) | |
download | frameworks_base-644f41368f9eddd475fa9c5dddc7ceac5722a3a8.zip frameworks_base-644f41368f9eddd475fa9c5dddc7ceac5722a3a8.tar.gz frameworks_base-644f41368f9eddd475fa9c5dddc7ceac5722a3a8.tar.bz2 |
Merge commit '4cb5d80' into merge2
Diffstat (limited to 'services/tests')
-rw-r--r-- | services/tests/servicestests/src/android/net/dhcp/DhcpPacketTest.java | 3 |
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; |