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

Commit 6f81be9e authored by Joseph Pirozzo's avatar Joseph Pirozzo Committed by Automerger Merge Worker
Browse files

Merge "MapClient Logging cleanup" am: 0b7ae153 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1690647

Change-Id: I1fd721279403cee1b8b2cb5d9be39cee19380ce6
parents 1742f28a 0b7ae153

android/app/src/com/android/bluetooth/mapclient/MceStateMachine.java

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ class MceStateMachine extends StateMachine { 
    // Set message status to read or deleted

    static final int MSG_SET_MESSAGE_STATUS = 2006;



    private static final String TAG = "MceSM";

    private static final String TAG = "MceStateMachine";

    private static final Boolean DBG = MapClientService.DBG;

    private static final int DISCONNECT_TIMEOUT = 3000;

    private static final int CONNECT_TIMEOUT = 10000;

android/app/src/com/android/bluetooth/mapclient/obex/BmessageParser.java

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import java.text.ParseException; 
/* BMessage as defined by MAP_SPEC_V101 Section 3.1.3 Message format (x-bt/message) */

class BmessageParser {

    private static final String TAG = "BmessageParser";

    private static final boolean DBG = false;

    private static final boolean DBG = MapClientService.DBG;



    private static final String CRLF = "\r\n";
@@ -293,7 +293,7 @@ class BmessageParser { 
         * 2020-06-01: we could now expect MMS to be more than text, e.g., image-only, so charset

         * not always UTF-8, downgrading log message from ERROR to DEBUG.

         */

        if (!"UTF-8".equals(mBmsg.mBbodyCharset)) {

        if (DBG && !"UTF-8".equals(mBmsg.mBbodyCharset)) {

            Log.d(TAG, "The charset was not set to charset UTF-8: " + mBmsg.mBbodyCharset);

        }

android/app/src/com/android/bluetooth/mapclient/obex/BmsgTokenizer.java

+5 −1
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ import java.util.regex.Matcher; 
import java.util.regex.Pattern;



public final class BmsgTokenizer {

    private static final String TAG = "BmsgTokenizer";

    private static final boolean VDBG = MapClientService.VDBG;



    private final String mStr;
@@ -89,7 +91,9 @@ public final class BmsgTokenizer { 
            this.name = name;

            this.value = value;



            Log.v("BMSG >> ", toString());

            if (VDBG) {

                Log.v(TAG, toString());

            }

        }



        @Override