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

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

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

Merge commit 'a905d955'

* commit 'a905d955':
  Remove STOPSHIP and reduce log spam.
parents 4138b338 a905d955

core/java/android/bluetooth/BluetoothDeviceProfileState.java

+7 −7
Original line number Original line Diff line number Diff line
@@ -59,7 +59,7 @@ import java.util.Set; 
 */

 */

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;





    // TODO(): Restructure the state machine to make it scalable with regard to profiles.

    // TODO(): Restructure the state machine to make it scalable with regard to profiles.

    public static final int CONNECT_HFP_OUTGOING = 1;

    public static final int CONNECT_HFP_OUTGOING = 1;
@@ -246,7 +246,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);
@@ -346,7 +346,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) {
@@ -458,7 +458,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) {
@@ -537,7 +537,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) {
@@ -646,7 +646,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) {
@@ -875,7 +875,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) {

core/java/android/bluetooth/BluetoothProfileState.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;