diff options
17 files changed, 25 insertions, 30 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java b/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java index 2dfdfda7eaa3..418b138c3b0a 100644 --- a/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java @@ -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"; diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 079b2f28ce47..86040c2842ed 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -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"; diff --git a/services/core/java/com/android/server/NsdService.java b/services/core/java/com/android/server/NsdService.java index f4c62259e194..11aef178a26f 100644 --- a/services/core/java/com/android/server/NsdService.java +++ b/services/core/java/com/android/server/NsdService.java @@ -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; diff --git a/services/core/java/com/android/server/connectivity/KeepaliveTracker.java b/services/core/java/com/android/server/connectivity/KeepaliveTracker.java index 90c9ddffd6bd..9e1f6b85ce39 100644 --- a/services/core/java/com/android/server/connectivity/KeepaliveTracker.java +++ b/services/core/java/com/android/server/connectivity/KeepaliveTracker.java @@ -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; diff --git a/services/core/java/com/android/server/connectivity/NetworkMonitor.java b/services/core/java/com/android/server/connectivity/NetworkMonitor.java index fb8b110fbcab..73da427c47c4 100644 --- a/services/core/java/com/android/server/connectivity/NetworkMonitor.java +++ b/services/core/java/com/android/server/connectivity/NetworkMonitor.java @@ -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; diff --git a/services/core/java/com/android/server/connectivity/PermissionMonitor.java b/services/core/java/com/android/server/connectivity/PermissionMonitor.java index debda1483d9a..22cefd14d45f 100644 --- a/services/core/java/com/android/server/connectivity/PermissionMonitor.java +++ b/services/core/java/com/android/server/connectivity/PermissionMonitor.java @@ -54,7 +54,7 @@ import java.util.Set; */ public class PermissionMonitor { private static final String TAG = "PermissionMonitor"; - private static final boolean DBG = true; + private static final boolean DBG = false; private static final boolean SYSTEM = true; private static final boolean NETWORK = false; diff --git a/services/core/java/com/android/server/connectivity/Tethering.java b/services/core/java/com/android/server/connectivity/Tethering.java index 760b21819420..4eecc8186c1e 100644 --- a/services/core/java/com/android/server/connectivity/Tethering.java +++ b/services/core/java/com/android/server/connectivity/Tethering.java @@ -90,7 +90,7 @@ public class Tethering extends BaseNetworkObserver { private Context mContext; private final static String TAG = "Tethering"; - private final static boolean DBG = true; + private final static boolean DBG = false; private final static boolean VDBG = false; // TODO - remove both of these - should be part of interface inspection/selection stuff diff --git a/services/core/java/com/android/server/net/IpConfigStore.java b/services/core/java/com/android/server/net/IpConfigStore.java index 9f1435acd4c7..2807ec822ba8 100644 --- a/services/core/java/com/android/server/net/IpConfigStore.java +++ b/services/core/java/com/android/server/net/IpConfigStore.java @@ -40,7 +40,7 @@ import java.net.Inet4Address; public class IpConfigStore { private static final String TAG = "IpConfigStore"; - private static final boolean DBG = true; + private static final boolean DBG = false; protected final DelayedDiskWrite mWriter; diff --git a/services/net/java/android/net/dhcp/DhcpClient.java b/services/net/java/android/net/dhcp/DhcpClient.java index 4f99bffe245b..e2562cd5d40b 100644 --- a/services/net/java/android/net/dhcp/DhcpClient.java +++ b/services/net/java/android/net/dhcp/DhcpClient.java @@ -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")); } } diff --git a/services/net/java/android/net/ip/IpManager.java b/services/net/java/android/net/ip/IpManager.java index afae9563cb19..c7c50153f855 100644 --- a/services/net/java/android/net/ip/IpManager.java +++ b/services/net/java/android/net/ip/IpManager.java @@ -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. diff --git a/services/net/java/android/net/ip/IpReachabilityMonitor.java b/services/net/java/android/net/ip/IpReachabilityMonitor.java index 88155f715f49..5b4fd503e0bb 100644 --- a/services/net/java/android/net/ip/IpReachabilityMonitor.java +++ b/services/net/java/android/net/ip/IpReachabilityMonitor.java @@ -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 { diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java index 6ab0b998bd6c..837b4a4963ad 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java @@ -75,7 +75,7 @@ import java.util.List; */ public class VoiceInteractionManagerService extends SystemService { static final String TAG = "VoiceInteractionManagerService"; - static final boolean DEBUG = true; + static final boolean DEBUG = false; final Context mContext; final ContentResolver mResolver; diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index ad007c648617..39a9295ed8b6 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -36,7 +36,7 @@ import android.telephony.Rlog; public class ServiceState implements Parcelable { static final String LOG_TAG = "PHONE"; - static final boolean DBG = true; + static final boolean DBG = false; static final boolean VDBG = false; // STOPSHIP if true /** diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index e90be91e3248..b482811a18f2 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -4403,7 +4403,6 @@ public class TelephonyManager { Log.e(TAG, "Error calling ITelephony#getDataEnabled", e); } catch (NullPointerException e) { } - Log.d(TAG, "getDataEnabled: retVal=" + retVal); return retVal; } diff --git a/tests/OneMedia/src/com/android/onemedia/playback/LocalRenderer.java b/tests/OneMedia/src/com/android/onemedia/playback/LocalRenderer.java index c8a8d6cae969..6463e1f76b6a 100644 --- a/tests/OneMedia/src/com/android/onemedia/playback/LocalRenderer.java +++ b/tests/OneMedia/src/com/android/onemedia/playback/LocalRenderer.java @@ -47,7 +47,7 @@ public class LocalRenderer extends Renderer implements OnPreparedListener, OnBufferingUpdateListener, OnCompletionListener, OnErrorListener, OnAudioFocusChangeListener { private static final String TAG = "MediaPlayerManager"; - private static final boolean DEBUG = true; + private static final boolean DEBUG = false; private static long sDebugInstanceId = 0; private static final String[] SUPPORTED_FEATURES = { diff --git a/tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/TestSoundTriggerActivity.java b/tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/TestSoundTriggerActivity.java index 4770c056814c..3ca96d2e7a06 100644 --- a/tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/TestSoundTriggerActivity.java +++ b/tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/TestSoundTriggerActivity.java @@ -40,7 +40,7 @@ import android.widget.Toast; public class TestSoundTriggerActivity extends Activity { private static final String TAG = "TestSoundTriggerActivity"; - private static final boolean DBG = true; + private static final boolean DBG = false; private SoundTriggerUtil mSoundTriggerUtil; private Random mRandom; diff --git a/tests/VoiceEnrollment/src/com/android/test/voiceenrollment/TestEnrollmentActivity.java b/tests/VoiceEnrollment/src/com/android/test/voiceenrollment/TestEnrollmentActivity.java index 2494db7ee623..54c944f9588e 100644 --- a/tests/VoiceEnrollment/src/com/android/test/voiceenrollment/TestEnrollmentActivity.java +++ b/tests/VoiceEnrollment/src/com/android/test/voiceenrollment/TestEnrollmentActivity.java @@ -31,7 +31,7 @@ import android.widget.Toast; public class TestEnrollmentActivity extends Activity { private static final String TAG = "TestEnrollmentActivity"; - private static final boolean DBG = true; + private static final boolean DBG = false; /** Keyphrase related constants, must match those defined in enrollment_application.xml */ private static final int KEYPHRASE_ID = 101; |