Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add volatile qualifier to boolean variable" into nyc-dev

Browse Source
This commit is contained in:
Hugo Benichi
2016-04-14 04:19:49 +00:00
committed by Android (Google) Code Review
parent 0697c7a877 67530d6585
commit fbd47caf40
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/net/java/android/net/dhcp/DhcpClient.java
View File

@@ -336,17 +336,17 @@ public class DhcpClient extends StateMachine {
class ReceiveThread extends Thread { class ReceiveThread extends Thread {
private final byte[] mPacket = new byte[DhcpPacket.MAX_LENGTH]; private final byte[] mPacket = new byte[DhcpPacket.MAX_LENGTH];
private boolean stopped = false; private volatile boolean mStopped = false;
public void halt() { public void halt() {
stopped = true; mStopped = true;
closeSockets(); // Interrupts the read() call the thread is blocked in. closeSockets(); // Interrupts the read() call the thread is blocked in.
} }
@Override @Override
public void run() { public void run() {
if (DBG) Log.d(TAG, "Receive thread started"); if (DBG) Log.d(TAG, "Receive thread started");
while (!stopped) { while (!mStopped) {
int length = 0; // Or compiler can't tell it's initialized if a parse error occurs. int length = 0; // Or compiler can't tell it's initialized if a parse error occurs.
try { try {
length = Os.read(mPacketSock, mPacket, 0, mPacket.length); length = Os.read(mPacketSock, mPacket, 0, mPacket.length);
@@ -355,7 +355,7 @@ public class DhcpClient extends StateMachine {
if (DBG) Log.d(TAG, "Received packet: " + packet); if (DBG) Log.d(TAG, "Received packet: " + packet);
sendMessage(CMD_RECEIVED_PACKET, packet); sendMessage(CMD_RECEIVED_PACKET, packet);
} catch (IOException|ErrnoException e) { } catch (IOException|ErrnoException e) {
if (!stopped) { if (!mStopped) {
Log.e(TAG, "Read error", e); Log.e(TAG, "Read error", e);
} }
DhcpClientEvent.logEvent(IpConnectivityEvent.IPCE_DHCP_RECV_ERROR, DhcpClientEvent.logEvent(IpConnectivityEvent.IPCE_DHCP_RECV_ERROR,