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

Commit b9f0d694 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'LA.BF.1.1.3_rb1.8' of... 

Merge branch 'LA.BF.1.1.3_rb1.8' of git://codeaurora.org/platform/packages/apps/Bluetooth into cm-13.0
parents 4885bdd4 e72ad141

src/com/android/bluetooth/map/BluetoothMapContent.java

+2 −2
Original line number Diff line number Diff line
@@ -2049,9 +2049,9 @@ public class BluetoothMapContent { 
         * should cause all parameters to be included in the message list. */

        if(ap.getParameterMask() == BluetoothMapAppParams.INVALID_VALUE_PARAMETER ||

                ap.getParameterMask() == 0) {

            ap.setParameterMask(PARAMETER_MASK_DEFAULT);

            ap.setParameterMask(PARAMETER_MASK_ALL_ENABLED);

            if (V) Log.v(TAG, "msgListing(): appParameterMask is zero or not present, " +

                    "changing to default: " + ap.getParameterMask());

                    "changing to All Enabled by default: " + ap.getParameterMask());

        }

        if (V) Log.v(TAG, "folderElement hasSmsMmsContent = " + folderElement.hasSmsMmsContent() +

                " folderElement.hasEmailContent = " + folderElement.hasEmailContent() +

src/com/android/bluetooth/map/BluetoothMapContentEmail.java

+2 −2
Original line number Diff line number Diff line
@@ -1062,9 +1062,9 @@ public class BluetoothMapContentEmail extends BluetoothMapContent { 
         * should cause all parameters to be included in the message list. */

        if(ap.getParameterMask() == BluetoothMapAppParams.INVALID_VALUE_PARAMETER ||

                ap.getParameterMask() == 0) {

            ap.setParameterMask(PARAMETER_MASK_DEFAULT);

            ap.setParameterMask(PARAMETER_MASK_ALL_ENABLED);

            if (V) Log.v(TAG, "msgListing(): appParameterMask is zero or not present, " +

                    "changing to default: " + ap.getParameterMask());

                    "changing to all enabled by default: " + ap.getParameterMask());

        }

        if (V) Log.v(TAG, "folderElement hasSmsMmsContent = " + folderElement.hasSmsMmsContent() +

                " folderElement.hasEmailContent = " + folderElement.hasEmailContent() +

src/com/android/bluetooth/opp/BluetoothOppService.java

+23 −6
Original line number Diff line number Diff line
@@ -357,12 +357,29 @@ public class BluetoothOppService extends Service { 
    private void startSocketListener() {



       if (V) Log.v(TAG, "start Socket Listeners");

       if (mSocketListener != null ) {

           mBtRfcServerSocket = mSocketListener.openRfcommSocket();

       }



       if (mL2cSocketListener != null) {

           mBtL2cServerSocket = mL2cSocketListener.openL2capSocket();

       }



       if (mBtRfcServerSocket != null && mBtL2cServerSocket != null) {

           mOppSdpHandle = SdpManager.getDefaultManager().createOppOpsRecord("OBEX Object Push",

       mBtRfcServerSocket.getChannel(),mBtL2cServerSocket.getChannel(),0x0102,SdpManager.OPP_FORMAT_ALL);

              mBtRfcServerSocket.getChannel(), mBtL2cServerSocket.getChannel(),

                 0x0102, SdpManager.OPP_FORMAT_ALL);

       } else {

           Log.e(TAG, "ERROR:serversocket object is NULL");

       }



       if (mSocketListener != null) {

          mSocketListener.start(mHandler);

       }



       if (mL2cSocketListener != null) {

          mL2cSocketListener.start(mHandler);

       }



    }