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

Commit d6c87ccd authored by Matthew Xie's avatar Matthew Xie Committed by Android (Google) Code Review
Browse files

Merge "Fixed 32 bit characteristic value assignment" into jb-mr2-dev

parents 999c2a69 3f36660a

core/java/android/bluetooth/BluetoothGattCharacteristic.java

+2 −1
Original line number Diff line number Diff line
@@ -529,7 +529,8 @@ public class BluetoothGattCharacteristic { 
            case FORMAT_UINT32:

                mValue[offset++] = (byte)(value & 0xFF);

                mValue[offset++] = (byte)((value >> 8) & 0xFF);

                mValue[offset] = (byte)((value >> 16) & 0xFF);

                mValue[offset++] = (byte)((value >> 16) & 0xFF);

                mValue[offset] = (byte)((value >> 24) & 0xFF);

                break;



            default:

core/java/android/bluetooth/BluetoothGattServer.java

+2 −2
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ public final class BluetoothGattServer implements BluetoothProfile { 
     *

     * <p>The connection may not be established right away, but will be

     * completed when the remote device is available. A

     * {@link BluetoothGattCallback#onConnectionStateChange} callback will be

     * {@link BluetoothGattServerCallback#onConnectionStateChange} callback will be

     * invoked when the connection state changes as a result of this function.

     *

     * <p>The autoConnect paramter determines whether to actively connect to
@@ -553,7 +553,7 @@ public final class BluetoothGattServer implements BluetoothProfile { 
     * @return true, if the connection attempt was initiated successfully

     */

    public boolean connect(BluetoothDevice device, boolean autoConnect) {

        if (DBG) Log.d(TAG, "connect: " + device.getAddress() + ", auto: " + autoConnect);

        if (DBG) Log.d(TAG, "connect() - device: " + device.getAddress() + ", auto: " + autoConnect);

        if (mService == null || mServerIf == 0) return false;



        try {