Remove STOPSHIP and reduce log spam.
We still need some logs, as it helped me fix the errant headset bug.
Bug: 3095000
Change-Id: If12601430e6dc30490df1ff86fc3f9d4d455e6d5
diff --git a/core/java/android/bluetooth/BluetoothDeviceProfileState.java b/core/java/android/bluetooth/BluetoothDeviceProfileState.java
index 17b28d1..71aefbc 100644
--- a/core/java/android/bluetooth/BluetoothDeviceProfileState.java
+++ b/core/java/android/bluetooth/BluetoothDeviceProfileState.java
@@ -56,7 +56,7 @@
*/
public final class BluetoothDeviceProfileState extends HierarchicalStateMachine {
private static final String TAG = "BluetoothDeviceProfileState";
- private static final boolean DBG = true; //STOPSHIP - Change to false
+ private static final boolean DBG = false;
public static final int CONNECT_HFP_OUTGOING = 1;
public static final int CONNECT_HFP_INCOMING = 2;
@@ -222,7 +222,7 @@
private class BondedDevice extends HierarchicalState {
@Override
protected void enter() {
- log("Entering ACL Connected state with: " + getCurrentMessage().what);
+ Log.i(TAG, "Entering ACL Connected state with: " + getCurrentMessage().what);
Message m = new Message();
m.copyFrom(getCurrentMessage());
sendMessageAtFrontOfQueue(m);
@@ -300,7 +300,7 @@
@Override
protected void enter() {
- log("Entering OutgoingHandsfree state with: " + getCurrentMessage().what);
+ Log.i(TAG, "Entering OutgoingHandsfree state with: " + getCurrentMessage().what);
mCommand = getCurrentMessage().what;
if (mCommand != CONNECT_HFP_OUTGOING &&
mCommand != DISCONNECT_HFP_OUTGOING) {
@@ -395,7 +395,7 @@
@Override
protected void enter() {
- log("Entering IncomingHandsfree state with: " + getCurrentMessage().what);
+ Log.i(TAG, "Entering IncomingHandsfree state with: " + getCurrentMessage().what);
mCommand = getCurrentMessage().what;
if (mCommand != CONNECT_HFP_INCOMING &&
mCommand != DISCONNECT_HFP_INCOMING) {
@@ -467,7 +467,7 @@
@Override
protected void enter() {
- log("Entering OutgoingA2dp state with: " + getCurrentMessage().what);
+ Log.i(TAG, "Entering OutgoingA2dp state with: " + getCurrentMessage().what);
mCommand = getCurrentMessage().what;
if (mCommand != CONNECT_A2DP_OUTGOING &&
mCommand != DISCONNECT_A2DP_OUTGOING) {
@@ -559,7 +559,7 @@
@Override
protected void enter() {
- log("Entering IncomingA2dp state with: " + getCurrentMessage().what);
+ Log.i(TAG, "Entering IncomingA2dp state with: " + getCurrentMessage().what);
mCommand = getCurrentMessage().what;
if (mCommand != CONNECT_A2DP_INCOMING &&
mCommand != DISCONNECT_A2DP_INCOMING) {
@@ -643,7 +643,7 @@
}
synchronized boolean processCommand(int command) {
- log("Processing command:" + command);
+ Log.i(TAG, "Processing command:" + command);
switch(command) {
case CONNECT_HFP_OUTGOING:
if (mHeadsetService != null) {
diff --git a/core/java/android/bluetooth/BluetoothProfileState.java b/core/java/android/bluetooth/BluetoothProfileState.java
index dc0b32b..686ff7c 100644
--- a/core/java/android/bluetooth/BluetoothProfileState.java
+++ b/core/java/android/bluetooth/BluetoothProfileState.java
@@ -40,7 +40,7 @@
*/
public class BluetoothProfileState extends HierarchicalStateMachine {
- private static final boolean DBG = true; // STOPSHIP - change to false.
+ private static final boolean DBG = true;
private static final String TAG = "BluetoothProfileState";
public static final int HFP = 0;
