diff options
| author | Prerepa Viswanadham <dham@google.com> | 2015-04-10 15:54:48 -0700 |
|---|---|---|
| committer | Prerepa Viswanadham <dham@google.com> | 2015-04-10 15:54:48 -0700 |
| commit | 220951a6d0a408313256d0a9078c8ae8d8321c03 (patch) | |
| tree | a04000f54e94277d455dcc234a50952f01e157a8 /services/net | |
| parent | f79d5b84d5e591f1675c101a8fea0e6461de5327 (diff) | |
| parent | b2ff4151bba45e15b82dca380b1c46175e5d0ec3 (diff) | |
| download | frameworks_base-220951a6d0a408313256d0a9078c8ae8d8321c03.zip frameworks_base-220951a6d0a408313256d0a9078c8ae8d8321c03.tar.gz frameworks_base-220951a6d0a408313256d0a9078c8ae8d8321c03.tar.bz2 | |
Merge commit 'b2ff415' into merge_work
Change-Id: I4f9c662112fc49e4f94315d3c69860607be3bc1e
Diffstat (limited to 'services/net')
| -rw-r--r-- | services/net/java/android/net/dhcp/DhcpClient.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/net/java/android/net/dhcp/DhcpClient.java b/services/net/java/android/net/dhcp/DhcpClient.java index 57cc251..e9203a4 100644 --- a/services/net/java/android/net/dhcp/DhcpClient.java +++ b/services/net/java/android/net/dhcp/DhcpClient.java @@ -330,8 +330,10 @@ public class DhcpClient extends BaseDhcpStateMachine { maybeLog("Received packet: " + packet); sendMessage(CMD_RECEIVED_PACKET, packet); } - } catch(IOException|ErrnoException e) { - Log.e(TAG, "Read error", e); + } catch (IOException|ErrnoException e) { + if (!stopped) { + Log.e(TAG, "Read error", e); + } } } maybeLog("Stopping receive thread"); |