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

Commit a905d955 authored by Jaikumar Ganesh's avatar Jaikumar Ganesh Committed by Android Git Automerger
Browse files

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

Merge commit 'a31cbd61' into gingerbread-plus-aosp

* commit 'a31cbd61':
  Remove STOPSHIP and reduce log spam.
parents c6bf3eaa a31cbd61

core/java/android/bluetooth/BluetoothDeviceProfileState.java

+7 −7
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ import com.android.internal.util.HierarchicalStateMachine; 
 */

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 @@ public final class BluetoothDeviceProfileState extends HierarchicalStateMachine 
    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 @@ public final class BluetoothDeviceProfileState extends HierarchicalStateMachine 


        @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 @@ public final class BluetoothDeviceProfileState extends HierarchicalStateMachine 


        @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 @@ public final class BluetoothDeviceProfileState extends HierarchicalStateMachine 


        @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 @@ public final class BluetoothDeviceProfileState extends HierarchicalStateMachine 


        @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 @@ public final class BluetoothDeviceProfileState extends HierarchicalStateMachine 
    }



    synchronized boolean processCommand(int command) {

        log("Processing command:" + command);

        Log.i(TAG, "Processing command:" + command);

        switch(command) {

            case  CONNECT_HFP_OUTGOING:

                if (mHeadsetService != null) {

core/java/android/bluetooth/BluetoothProfileState.java

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import com.android.internal.util.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";



    public static final int HFP = 0;