summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Chan <mchan@android.com>2009-12-10 17:59:10 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-10 17:59:10 -0800
commit175821f978eda0d16c4406e209a395130864d178 (patch)
treeb67908f559a38ffb7e50dd285f477f94d9c5cb74
parent41fccf2cb3cc31a79bd59492990207247f0a5c64 (diff)
parentd1469da150f44415135d657d57592f066670b317 (diff)
downloadpackages_apps_settings-175821f978eda0d16c4406e209a395130864d178.zip
packages_apps_settings-175821f978eda0d16c4406e209a395130864d178.tar.gz
packages_apps_settings-175821f978eda0d16c4406e209a395130864d178.tar.bz2
am d1469da1: Merge change I10036c49 into eclair
Merge commit 'd1469da150f44415135d657d57592f066670b317' into eclair-mr2 * commit 'd1469da150f44415135d657d57592f066670b317': b/2296110 Disable debugging/logging code before shipping.
-rw-r--r--src/com/android/settings/bluetooth/DockEventReceiver.java2
-rw-r--r--src/com/android/settings/bluetooth/DockService.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/bluetooth/DockEventReceiver.java b/src/com/android/settings/bluetooth/DockEventReceiver.java
index 33afe0a..261ec1d 100644
--- a/src/com/android/settings/bluetooth/DockEventReceiver.java
+++ b/src/com/android/settings/bluetooth/DockEventReceiver.java
@@ -26,7 +26,7 @@ import android.util.Log;
public class DockEventReceiver extends BroadcastReceiver {
- private static final boolean DEBUG = true;
+ private static final boolean DEBUG = false;
private static final String TAG = "DockEventReceiver";
diff --git a/src/com/android/settings/bluetooth/DockService.java b/src/com/android/settings/bluetooth/DockService.java
index 99cb1e5..484ce86 100644
--- a/src/com/android/settings/bluetooth/DockService.java
+++ b/src/com/android/settings/bluetooth/DockService.java
@@ -49,7 +49,7 @@ public class DockService extends Service implements AlertDialog.OnMultiChoiceCli
private static final String TAG = "DockService";
// TODO clean up logs. Disable DEBUG flag for this file and receiver's too
- private static final boolean DEBUG = true;
+ private static final boolean DEBUG = false;
// Time allowed for the device to be undocked and redocked without severing
// the bluetooth connection