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

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

Merge tag 'LA.UM.5.5.r1-00900-8x96.0' of... 

Merge tag 'LA.UM.5.5.r1-00900-8x96.0' of git://codeaurora.org/platform/packages/apps/Bluetooth into cm-14.0

"LA.UM.5.5.r1-00900-8x96.0"
parents 73f1cecb 0611b4c3

res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -55,4 +55,8 @@ 


    <!-- For enabling the hfp client connection service -->

    <bool name="hfp_client_connection_service_enabled">false</bool>



    <!-- For disabling non AOSP bluetooth features -->

    <bool name="disable_non_aosp_bt_features">false</bool>



</resources>

src/com/android/bluetooth/a2dp/A2dpStateMachine.java

+7 −0
Original line number Diff line number Diff line
@@ -217,7 +217,14 @@ final class A2dpStateMachine extends StateMachine { 


    public void cleanup() {

        log("Enter cleanup()");

        int deviceSize = mConnectedDevicesList.size();

        log("cleanup: mConnectedDevicesList size is " + deviceSize);

        cleanupNative();

        for (int i = 0; i < deviceSize; i++) {

             mCurrentDevice = mConnectedDevicesList.get(i);

             broadcastConnectionState(mCurrentDevice, BluetoothProfile.STATE_DISCONNECTED,

                                      BluetoothProfile.STATE_CONNECTED);

        }

        log("Exit cleanup()");

    }

src/com/android/bluetooth/btservice/Config.java

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import android.content.res.Resources; 
import android.os.SystemProperties;

import android.provider.Settings;

import android.util.Log;

import android.os.SystemProperties;





import com.android.bluetooth.R;

import com.android.bluetooth.a2dp.A2dpService;

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

+10 −2
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
*/

package com.android.bluetooth.map;



import com.android.bluetooth.R;

import java.util.ArrayList;

import java.util.LinkedHashMap;

import java.util.List;
@@ -53,7 +54,7 @@ public class BluetoothMapAppObserver{ 
    private Context mContext;

    private BroadcastReceiver mReceiver;

    private PackageManager mPackageManager = null;

    BluetoothMapAccountEmailLoader mLoader;

    BluetoothMapAccountLoader mLoader;

    BluetoothMapService mMapService = null;

    private boolean mRegisteredReceiver = false;
@@ -61,7 +62,14 @@ public class BluetoothMapAppObserver{ 
        mContext    = context;

        mMapService = mapService;

        mResolver   = context.getContentResolver();

        boolean isDisabledNonAosp = context.getResources().getBoolean

                (R.bool.disable_non_aosp_bt_features);

        if (D) Log.d(TAG, "isDisabledNonAosp :" + isDisabledNonAosp);

        if (isDisabledNonAosp) {

            mLoader = new BluetoothMapAccountLoader(mContext);

        } else {

            mLoader = new BluetoothMapAccountEmailLoader(mContext);

        }

        mFullList   = mLoader.parsePackages(false); /* Get the current list of apps */

        createReceiver();

        initObservers();

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

100644 → 100755
+7 −4
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ public class BluetoothMapContentEmail extends BluetoothMapContent { 
    /* The MasInstance reference is used to update persistent (over a connection) version counters*/

    private final BluetoothMapMasInstance mMasInstance;

    private String mMessageVersion = BluetoothMapUtils.MAP_V10_STR;

    private final boolean EMAIL_ATTACHMENT_IMPLEMENTED = false;



    private int mRemoteFeatureMask = BluetoothMapUtils.MAP_FEATURE_DEFAULT_BITMASK;

    private int mMsgListingVersion = BluetoothMapUtils.MAP_MESSAGE_LISTING_FORMAT_V10;
@@ -1719,7 +1720,7 @@ public class BluetoothMapContentEmail extends BluetoothMapContent { 
                    message.setEmailBody(emailBody);

                    //Parts

                    Long partId = c.getLong(c.getColumnIndex(BaseColumns._ID));

                    String contentType = "Content-Type: text/plain; charset=\"UTF-8\"";

                    String contentType = " text/plain; charset=\"UTF-8\"";

                    String name = null;//c.getString(c.getColumnIndex("displayName"));

                    String text = null;
@@ -1820,7 +1821,7 @@ public class BluetoothMapContentEmail extends BluetoothMapContent { 
                   // Set message type:

                   message.setType(TYPE.EMAIL);

                   message.setVersionString(mMessageVersion);

                   message.setContentType("Content-Type: text/plain; charset=\"UTF-8\"");

                   message.setContentType(" text/plain; charset=\"UTF-8\"");

                   message.setDate(c.getLong(c.getColumnIndex(BluetoothMapEmailContract

                       .ExtEmailMessageColumns.TIMESTAMP)));

                   message.setSubject(c.getString(c.getColumnIndex(BluetoothMapContract
@@ -1868,10 +1869,12 @@ public class BluetoothMapContentEmail extends BluetoothMapContent { 
                   if(c != null) c.close();

               }

               // Find out if we get attachments

               //TODO: Attachment Support needs fetch from Attachment content Uri

               /* TODO: Attachment yet to be supported: Needs fetch from Attachment content Uri.

                        Hence, mark attachment support false always for now.

               // String attStr = (appParams.getAttachment() == 0) ?

               //     "/" +  BluetoothMapContract.FILE_MSG_NO_ATTACHMENTS : "";

               message.setIncludeAttachments(appParams.getAttachment() == 0 ? false : true);

               */

               message.setIncludeAttachments(EMAIL_ATTACHMENT_IMPLEMENTED);



               // The parts

               extractEmailParts(id, message);