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

Commit 785152b1 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'LA.BF64.1.2.1_rb2.6' of... 

Merge branch 'LA.BF64.1.2.1_rb2.6' of git://codeaurora.org/platform/packages/apps/Bluetooth into cm-12.1
parents d9238c1d f55ccbae

src/com/android/bluetooth/avrcp/Avrcp.java

+1 −1
Original line number Diff line number Diff line
@@ -2971,7 +2971,7 @@ public final class Avrcp { 
                while (rccIterator.hasNext()) {

                    final MediaPlayerInfo di = rccIterator.next();

                    if (di.GetPlayerFocus()) {

                        if (!di.IsRemoteAddressable()) {

                        if (!di.IsRemoteAddressable() || mCurrentPath.equals(PATH_INVALID)) {

                            getFolderItemsRspNative((byte)INTERNAL_ERROR, numItems, itemType,

                                uid, type, playable, displayName, numAtt, attValues, attIds);

                            Log.e(TAG, "GetFolderItems fails: addressed player is not browsable");

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

+1 −0
Original line number Diff line number Diff line
@@ -333,6 +333,7 @@ final class AdapterState extends StateMachine { 
                    adapterService.ssrcleanupNative(false);

                    mPendingCommandState.setTurningOn(false);

                    transitionTo(mOffState);

                    adapterService.stopProfileServices();

                    notifyAdapterStateChange(BluetoothAdapter.STATE_OFF);

                    break;

                case STOP_TIMEOUT:

src/com/android/bluetooth/gatt/GattService.java

+16 −4
Original line number Diff line number Diff line
@@ -208,16 +208,28 @@ public class GattService extends ProfileService { 
        mServiceDeclarations.clear();

        mActiveServiceDeclarations.clear();

        mReliableQueue.clear();

        if (mAdvertiseManager != null) mAdvertiseManager.cleanup();

        if (mScanManager != null) mScanManager.cleanup();

        if (mAdvertiseManager != null) {

            mAdvertiseManager.cleanup();

            mAdvertiseManager = null;

        }

        if (mScanManager != null) {

            mScanManager.cleanup();

            mScanManager = null;

        }

        return true;

    }



    protected boolean cleanup() {

        if (DBG) Log.d(TAG, "cleanup()");

        cleanupNative();

        if (mAdvertiseManager != null) mAdvertiseManager.cleanup();

        if (mScanManager != null) mScanManager.cleanup();

        if (mAdvertiseManager != null) {

            mAdvertiseManager.cleanup();

            mAdvertiseManager = null;

        }

        if (mScanManager != null) {

            mScanManager.cleanup();

            mScanManager = null;

        }

        return true;

    }

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

100644 → 100755
+1 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ public abstract class BluetoothMapbMessage { 
                        // Empty phone number - ignore

                }

                else if(line.startsWith("EMAIL:")){

                    line = line.replace("&lt;", "<").replace("&gt;", ">");

                    parts = line.split("[^\\\\]:"); // Split on "un-escaped" :

                    if(parts.length == 2) {

                        String[] subParts = parts[1].split("[^\\\\];");

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

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ public class BluetoothOppManager { 


    public boolean mMultipleFlag;



    private int mfileNumInBatch;

    private int mfileNumInBatch = 1;



    private int mInsertShareThreadNum = 0;