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 
am: fbd47ca

* commit 'fbd47caf4099d7bd83e40b2cf9b4bc54ede4ca8f':
  Add volatile qualifier to boolean variable

Change-Id: I8e89883356ccf1e1a265f08fc55e647de65bd340
This commit is contained in:
Hugo Benichi
2016-04-14 04:21:56 +00:00
committed by android-build-merger
parent b28d871a8d fbd47caf40
commit 1b6f396978
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 {
private final byte[] mPacket = new byte[DhcpPacket.MAX_LENGTH];
private boolean stopped = false;
private volatile boolean mStopped = false;
public void halt() {
stopped = true;
mStopped = true;
closeSockets(); // Interrupts the read() call the thread is blocked in.
}
@Override
public void run() {
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.
try {
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);
sendMessage(CMD_RECEIVED_PACKET, packet);
} catch (IOException|ErrnoException e) {
if (!stopped) {
if (!mStopped) {
Log.e(TAG, "Read error", e);
}
DhcpClientEvent.logEvent(IpConnectivityEvent.IPCE_DHCP_RECV_ERROR,