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

am 599efc3a: Merge "Fix minor LE descriptor permissions issue" into jb-mr2-dev

Browse Source 
* commit '599efc3aa34351e02bfa6e8b9e3fd530b8d9c632':
  Fix minor LE descriptor permissions issue
This commit is contained in:
Matthew Xie
2013-04-03 15:02:49 -07:00
committed by Android Git Automerger
parent 8d58f213d3 599efc3aa3
commit afa72ed8b8
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -554,9 +554,10 @@ public final class BluetoothGattServer implements BluetoothProfile {
List<BluetoothGattDescriptor> descriptors = characteristic.getDescriptors(); List<BluetoothGattDescriptor> descriptors = characteristic.getDescriptors();
for (BluetoothGattDescriptor descriptor: descriptors) { for (BluetoothGattDescriptor descriptor: descriptors) {
permission = ((characteristic.getKeySize() - 7) << 12)
+ descriptor.getPermissions();
mService.addDescriptor(mServerIf, mService.addDescriptor(mServerIf,
new ParcelUuid(descriptor.getUuid()), new ParcelUuid(descriptor.getUuid()), permission);
descriptor.getPermissions());
} }
} }