Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Matthew Xie
2013-03-12 17:58:03 +00:00
committed by Android (Google) Code Review
parent 999c2a69b4 3f36660a60
commit d6c87ccde6
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/bluetooth/BluetoothGattCharacteristic.java
View File

@@ -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:

4
core/java/android/bluetooth/BluetoothGattServer.java
View File

@@ -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 {