Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aef32a48 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

Merge "Enable more logs for networking" am: f3736d67 am: 310609b8 

am: d33e31e2

Change-Id: Icd81490cabaaf1d164ce77bda76b196b869c8721
parents a59ffcd1 d33e31e2

packages/NetworkStack/src/android/net/dhcp/DhcpClient.java

+3 −3
Original line number Diff line number Diff line
@@ -102,9 +102,9 @@ public class DhcpClient extends StateMachine { 


    private static final String TAG = "DhcpClient";

    private static final boolean DBG = true;

    private static final boolean STATE_DBG = false;

    private static final boolean MSG_DBG = false;

    private static final boolean PACKET_DBG = false;

    private static final boolean STATE_DBG = Log.isLoggable(TAG, Log.DEBUG);

    private static final boolean MSG_DBG = Log.isLoggable(TAG, Log.DEBUG);

    private static final boolean PACKET_DBG = Log.isLoggable(TAG, Log.DEBUG);



    // Metrics events: must be kept in sync with server-side aggregation code.

    /** Represents transitions from DhcpInitState to DhcpBoundState */

packages/NetworkStack/src/android/net/ip/IpReachabilityMonitor.java

+2 −2
Original line number Diff line number Diff line
@@ -129,8 +129,8 @@ import java.util.Map; 
 */

public class IpReachabilityMonitor {

    private static final String TAG = "IpReachabilityMonitor";

    private static final boolean DBG = false;

    private static final boolean VDBG = false;

    private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);

    private static final boolean VDBG = Log.isLoggable(TAG, Log.VERBOSE);



    public interface Callback {

        // This callback function must execute as quickly as possible as it is