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

Commit 5d4ab988 authored by Joe Onorato's avatar Joe Onorato Committed by Android (Google) Code Review
Browse files

Merge changes Ib6e0e6f3,I109f04c2,Idc716000,I44c51d5f,I810b9bd5, ... into nyc-dev 

* changes:
  Turn down the logging a little bit.
  Turn down the logging a little bit and don't do a log wrapper function.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
parents a561e3a3 12acbd78

packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ import java.util.Map; 
public class TileUtils {



    private static final boolean DEBUG = false;

    private static final boolean DEBUG_TIMING = true;

    private static final boolean DEBUG_TIMING = false;



    private static final String LOG_TAG = "TileUtils";

services/core/java/com/android/server/ConnectivityService.java

+2 −2
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        implements PendingIntent.OnFinished {

    private static final String TAG = "ConnectivityService";



    private static final boolean DBG = true;

    private static final boolean DBG = false;

    private static final boolean VDBG = false;



    private static final boolean LOGD_RULES = false;
@@ -455,7 +455,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
     */

    private class LegacyTypeTracker {



        private static final boolean DBG = true;

        private static final boolean DBG = false;

        private static final boolean VDBG = false;

        private static final String TAG = "CSLegacyTypeTracker";

services/core/java/com/android/server/NsdService.java

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public class NsdService extends INsdManager.Stub { 
    private static final String TAG = "NsdService";

    private static final String MDNS_TAG = "mDnsConnector";



    private static final boolean DBG = true;

    private static final boolean DBG = false;



    private Context mContext;

    private ContentResolver mContentResolver;

services/core/java/com/android/server/connectivity/KeepaliveTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ import static android.net.NetworkAgent.EVENT_PACKET_KEEPALIVE; 
public class KeepaliveTracker {



    private static final String TAG = "KeepaliveTracker";

    private static final boolean DBG = true;

    private static final boolean DBG = false;



    public static final String PERMISSION = android.Manifest.permission.PACKET_KEEPALIVE_OFFLOAD;

services/core/java/com/android/server/connectivity/NetworkMonitor.java

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ import java.util.Random; 
 * {@hide}

 */

public class NetworkMonitor extends StateMachine {

    private static final boolean DBG = true;

    private static final boolean DBG = false;

    private static final String TAG = "NetworkMonitor";

    private static final String DEFAULT_SERVER = "connectivitycheck.gstatic.com";

    private static final int SOCKET_TIMEOUT_MS = 10000;