Merge commit '4cb5d80' into merge2 (644f4136) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -19353,7 +19353,7 @@ package android.net.wifi {
		method public java.lang.String getAnonymousIdentity();
		method public java.security.cert.X509Certificate getCaCertificate();
		method public java.security.cert.X509Certificate getClientCertificate();
		method public java.lang.String getDomSubjectMatch();
		method public java.lang.String getDomainSubjectMatch();
		method public int getEapMethod();
		method public java.lang.String getIdentity();
		method public java.lang.String getPassword();
		@@ -19365,7 +19365,7 @@ package android.net.wifi {
		method public void setAnonymousIdentity(java.lang.String);
		method public void setCaCertificate(java.security.cert.X509Certificate);
		method public void setClientKeyEntry(java.security.PrivateKey, java.security.cert.X509Certificate);
		method public void setDomSuffixMatch(java.lang.String);
		method public void setDomainSuffixMatch(java.lang.String);
		method public void setEapMethod(int);
		method public void setIdentity(java.lang.String);
		method public void setPassword(java.lang.String);

api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -21074,7 +21074,7 @@ package android.net.wifi {
		method public java.lang.String getAnonymousIdentity();
		method public java.security.cert.X509Certificate getCaCertificate();
		method public java.security.cert.X509Certificate getClientCertificate();
		method public java.lang.String getDomSubjectMatch();
		method public java.lang.String getDomainSubjectMatch();
		method public int getEapMethod();
		method public java.lang.String getIdentity();
		method public java.lang.String getPassword();
		@@ -21086,7 +21086,7 @@ package android.net.wifi {
		method public void setAnonymousIdentity(java.lang.String);
		method public void setCaCertificate(java.security.cert.X509Certificate);
		method public void setClientKeyEntry(java.security.PrivateKey, java.security.cert.X509Certificate);
		method public void setDomSuffixMatch(java.lang.String);
		method public void setDomainSuffixMatch(java.lang.String);
		method public void setEapMethod(int);
		method public void setIdentity(java.lang.String);
		method public void setPassword(java.lang.String);

services/net/java/android/net/dhcp/DhcpAckPacket.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -29,9 +29,9 @@ class DhcpAckPacket extends DhcpPacket {
		*/
		private final Inet4Address mSrcIp;

		DhcpAckPacket(int transId, boolean broadcast, Inet4Address serverAddress,
		DhcpAckPacket(int transId, short secs, boolean broadcast, Inet4Address serverAddress,
		Inet4Address clientIp, byte[] clientMac) {
		super(transId, INADDR_ANY, clientIp, serverAddress, INADDR_ANY, clientMac, broadcast);
		super(transId, secs, INADDR_ANY, clientIp, serverAddress, INADDR_ANY, clientMac, broadcast);
		mBroadcast = broadcast;
		mSrcIp = serverAddress;
		}

services/net/java/android/net/dhcp/DhcpClient.java

+12 −5

Original line number	Diff line number	Diff line
		@@ -154,6 +154,7 @@ public class DhcpClient extends BaseDhcpStateMachine {
		private byte[] mHwAddr;
		private PacketSocketAddress mInterfaceBroadcastAddr;
		private int mTransactionId;
		private long mTransactionStartMillis;
		private DhcpResults mDhcpLease;
		private long mDhcpLeaseExpiry;
		private DhcpResults mOffer;
		@@ -264,8 +265,9 @@ public class DhcpClient extends BaseDhcpStateMachine {
		}
		}

		private void initTransactionId() {
		private void startNewTransaction() {
		mTransactionId = mRandom.nextInt();
		mTransactionStartMillis = SystemClock.elapsedRealtime();
		}

		private boolean initSockets() {
		@@ -344,6 +346,10 @@ public class DhcpClient extends BaseDhcpStateMachine {
		}
		}

		private short getSecs() {
		return (short) ((SystemClock.elapsedRealtime() - mTransactionStartMillis) / 1000);
		}

		private boolean transmitPacket(ByteBuffer buf, String description, Inet4Address to) {
		try {
		if (to.equals(INADDR_BROADCAST)) {
		@@ -362,7 +368,8 @@ public class DhcpClient extends BaseDhcpStateMachine {

		private boolean sendDiscoverPacket() {
		ByteBuffer packet = DhcpPacket.buildDiscoverPacket(
		DhcpPacket.ENCAP_L2, mTransactionId, mHwAddr, DO_UNICAST, REQUESTED_PARAMS);
		DhcpPacket.ENCAP_L2, mTransactionId, getSecs(), mHwAddr,
		DO_UNICAST, REQUESTED_PARAMS);
		return transmitPacket(packet, "DHCPDISCOVER", INADDR_BROADCAST);
		}

		@@ -373,7 +380,7 @@ public class DhcpClient extends BaseDhcpStateMachine {
		int encap = to.equals(INADDR_BROADCAST) ? DhcpPacket.ENCAP_L2 : DhcpPacket.ENCAP_BOOTP;

		ByteBuffer packet = DhcpPacket.buildRequestPacket(
		encap, mTransactionId, clientAddress,
		encap, mTransactionId, getSecs(), clientAddress,
		DO_UNICAST, mHwAddr, requestedAddress,
		serverAddress, REQUESTED_PARAMS, null);
		String description = "DHCPREQUEST ciaddr=" + clientAddress.getHostAddress() +
		@@ -669,7 +676,7 @@ public class DhcpClient extends BaseDhcpStateMachine {
		@Override
		public void enter() {
		super.enter();
		initTransactionId();
		startNewTransaction();
		}

		protected boolean sendPacket() {
		@@ -776,7 +783,7 @@ public class DhcpClient extends BaseDhcpStateMachine {
		@Override
		public void enter() {
		super.enter();
		initTransactionId();
		startNewTransaction();
		}

		protected boolean sendPacket() {

services/net/java/android/net/dhcp/DhcpDeclinePacket.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -26,10 +26,10 @@ class DhcpDeclinePacket extends DhcpPacket {
		/**
		* Generates a DECLINE packet with the specified parameters.
		*/
		DhcpDeclinePacket(int transId, Inet4Address clientIp, Inet4Address yourIp,
		DhcpDeclinePacket(int transId, short secs, Inet4Address clientIp, Inet4Address yourIp,
		Inet4Address nextIp, Inet4Address relayIp,
		byte[] clientMac) {
		super(transId, clientIp, yourIp, nextIp, relayIp, clientMac, false);
		super(transId, secs, clientIp, yourIp, nextIp, relayIp, clientMac, false);
		}

		public String toString() {