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

Turn down the logging a little bit and don't do a log wrapper function.

Browse Source 
Change-Id: I109f04c2c2299f26e21b076df3a935ce2d356bdf
This commit is contained in:
Joe Onorato
2016-02-01 17:49:10 -08:00
parent a102dd01e9
commit f188d41fa2
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,10 +84,10 @@ import static android.net.dhcp.DhcpPacket.*;
public class DhcpClient extends StateMachine {
private static final String TAG = "DhcpClient";
private static final boolean DBG = true;
private static final boolean DBG = false;
private static final boolean STATE_DBG = false;
private static final boolean MSG_DBG = false;
private static final boolean PACKET_DBG = true;
private static final boolean PACKET_DBG = false;
// Timers and timeouts.
private static final int SECONDS = 1000;
@@ -342,14 +342,14 @@ public class DhcpClient extends StateMachine {
@Override
public void run() {
maybeLog("Receive thread started");
if (DBG) Log.d(TAG, "Receive thread started");
while (!stopped) {
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);
DhcpPacket packet = null;
packet = DhcpPacket.decodeFullPacket(mPacket, length, DhcpPacket.ENCAP_L2);
maybeLog("Received packet: " + packet);
if (DBG) Log.d(TAG, "Received packet: " + packet);
sendMessage(CMD_RECEIVED_PACKET, packet);
} catch (IOException|ErrnoException e) {
if (!stopped) {
@@ -362,7 +362,7 @@ public class DhcpClient extends StateMachine {
}
}
}
maybeLog("Receive thread stopped");
if (DBG) Log.d(TAG, "Receive thread stopped");
}
}
@@ -373,12 +373,12 @@ public class DhcpClient extends StateMachine {
private boolean transmitPacket(ByteBuffer buf, String description, Inet4Address to) {
try {
if (to.equals(INADDR_BROADCAST)) {
maybeLog("Broadcasting " + description);
if (DBG) Log.d(TAG, "Broadcasting " + description);
Os.sendto(mPacketSock, buf.array(), 0, buf.limit(), 0, mInterfaceBroadcastAddr);
} else {
// It's safe to call getpeername here, because we only send unicast packets if we
// have an IP address, and we connect the UDP socket in DhcpHaveAddressState#enter.
maybeLog("Unicasting " + description + " to " + Os.getpeername(mUdpSock));
if (DBG) Log.d(TAG, "Unicasting " + description + " to " + Os.getpeername(mUdpSock));
Os.write(mUdpSock, buf);
}
} catch(ErrnoException|IOException e) {
@@ -454,10 +454,6 @@ public class DhcpClient extends StateMachine {
mController.sendMessage(CMD_ON_QUIT);
}
private void maybeLog(String msg) {
if (DBG) Log.d(TAG, msg);
}
abstract class LoggingState extends State {
public void enter() {
if (STATE_DBG) Log.d(TAG, "Entering state " + getName());
@@ -592,7 +588,7 @@ public class DhcpClient extends StateMachine {
transitionTo(mStoppedState);
return HANDLED;
case CMD_ONESHOT_TIMEOUT:
maybeLog("Timed out");
if (DBG) Log.d(TAG, "Timed out");
notifyFailure();
return HANDLED;
default:
@@ -790,7 +786,7 @@ public class DhcpClient extends StateMachine {
@Override
public void exit() {
maybeLog("Clearing IP address");
if (DBG) Log.d(TAG, "Clearing IP address");
setIpAddress(new LinkAddress("0.0.0.0/0"));
}
}

2
services/net/java/android/net/ip/IpManager.java
View File

@@ -63,7 +63,7 @@ import java.util.Objects;
* @hide
*/
public class IpManager extends StateMachine {
private static final boolean DBG = true;
private static final boolean DBG = false;
private static final boolean VDBG = false;
// For message logging.

2
services/net/java/android/net/ip/IpReachabilityMonitor.java
View File

@@ -132,7 +132,7 @@ import java.util.Set;
*/
public class IpReachabilityMonitor {
private static final String TAG = "IpReachabilityMonitor";
private static final boolean DBG = true;
private static final boolean DBG = false;
private static final boolean VDBG = false;
public interface Callback {