Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a31cbd61: Merge "Remove STOPSHIP and reduce log spam." into gingerbread

Browse Source 
Merge commit 'a31cbd61bc53730d756464b0c273475c4f738066' into gingerbread-plus-aosp

* commit 'a31cbd61bc53730d756464b0c273475c4f738066':
  Remove STOPSHIP and reduce log spam.
This commit is contained in:
Jaikumar Ganesh
2010-10-13 16:56:27 -07:00
committed by Android Git Automerger
parent c6bf3eaab4 a31cbd61bc
commit a905d95511
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/bluetooth/BluetoothDeviceProfileState.java
View File

@@ -56,7 +56,7 @@ import com.android.internal.util.HierarchicalStateMachine;
*/ */
public final class BluetoothDeviceProfileState extends HierarchicalStateMachine { public final class BluetoothDeviceProfileState extends HierarchicalStateMachine {
private static final String TAG = "BluetoothDeviceProfileState"; 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_OUTGOING = 1;
public static final int CONNECT_HFP_INCOMING = 2; public static final int CONNECT_HFP_INCOMING = 2;
@@ -222,7 +222,7 @@ public final class BluetoothDeviceProfileState extends HierarchicalStateMachine
private class BondedDevice extends HierarchicalState { private class BondedDevice extends HierarchicalState {
@Override @Override
protected void enter() { 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(); Message m = new Message();
m.copyFrom(getCurrentMessage()); m.copyFrom(getCurrentMessage());
sendMessageAtFrontOfQueue(m); sendMessageAtFrontOfQueue(m);
@@ -300,7 +300,7 @@ public final class BluetoothDeviceProfileState extends HierarchicalStateMachine
@Override @Override
protected void enter() { protected void enter() {
log("Entering OutgoingHandsfree state with: " + getCurrentMessage().what); Log.i(TAG, "Entering OutgoingHandsfree state with: " + getCurrentMessage().what);
mCommand = getCurrentMessage().what; mCommand = getCurrentMessage().what;
if (mCommand != CONNECT_HFP_OUTGOING && if (mCommand != CONNECT_HFP_OUTGOING &&
mCommand != DISCONNECT_HFP_OUTGOING) { mCommand != DISCONNECT_HFP_OUTGOING) {
@@ -395,7 +395,7 @@ public final class BluetoothDeviceProfileState extends HierarchicalStateMachine
@Override @Override
protected void enter() { protected void enter() {
log("Entering IncomingHandsfree state with: " + getCurrentMessage().what); Log.i(TAG, "Entering IncomingHandsfree state with: " + getCurrentMessage().what);
mCommand = getCurrentMessage().what; mCommand = getCurrentMessage().what;
if (mCommand != CONNECT_HFP_INCOMING && if (mCommand != CONNECT_HFP_INCOMING &&
mCommand != DISCONNECT_HFP_INCOMING) { mCommand != DISCONNECT_HFP_INCOMING) {
@@ -467,7 +467,7 @@ public final class BluetoothDeviceProfileState extends HierarchicalStateMachine
@Override @Override
protected void enter() { protected void enter() {
log("Entering OutgoingA2dp state with: " + getCurrentMessage().what); Log.i(TAG, "Entering OutgoingA2dp state with: " + getCurrentMessage().what);
mCommand = getCurrentMessage().what; mCommand = getCurrentMessage().what;
if (mCommand != CONNECT_A2DP_OUTGOING && if (mCommand != CONNECT_A2DP_OUTGOING &&
mCommand != DISCONNECT_A2DP_OUTGOING) { mCommand != DISCONNECT_A2DP_OUTGOING) {
@@ -559,7 +559,7 @@ public final class BluetoothDeviceProfileState extends HierarchicalStateMachine
@Override @Override
protected void enter() { protected void enter() {
log("Entering IncomingA2dp state with: " + getCurrentMessage().what); Log.i(TAG, "Entering IncomingA2dp state with: " + getCurrentMessage().what);
mCommand = getCurrentMessage().what; mCommand = getCurrentMessage().what;
if (mCommand != CONNECT_A2DP_INCOMING && if (mCommand != CONNECT_A2DP_INCOMING &&
mCommand != DISCONNECT_A2DP_INCOMING) { mCommand != DISCONNECT_A2DP_INCOMING) {
@@ -643,7 +643,7 @@ public final class BluetoothDeviceProfileState extends HierarchicalStateMachine
} }
synchronized boolean processCommand(int command) { synchronized boolean processCommand(int command) {
log("Processing command:" + command); Log.i(TAG, "Processing command:" + command);
switch(command) { switch(command) {
case CONNECT_HFP_OUTGOING: case CONNECT_HFP_OUTGOING:
if (mHeadsetService != null) { if (mHeadsetService != null) {

2
core/java/android/bluetooth/BluetoothProfileState.java
View File

@@ -40,7 +40,7 @@ import com.android.internal.util.HierarchicalStateMachine;
*/ */
public class BluetoothProfileState extends HierarchicalStateMachine { 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"; private static final String TAG = "BluetoothProfileState";
public static final int HFP = 0; public static final int HFP = 0;