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

* commit '599efc3aa34351e02bfa6e8b9e3fd530b8d9c632': Fix minor LE descriptor permissions issue
2013-04-03 15:02:49 -07:00
parent 8d58f213d3 599efc3aa3
commit afa72ed8b8
1 changed files with 3 additions and 2 deletions
--- a/core/java/android/bluetooth/BluetoothGattServer.java
+++ b/core/java/android/bluetooth/BluetoothGattServer.java
@@ -554,9 +554,10 @@ public final class BluetoothGattServer implements BluetoothProfile {

                List<BluetoothGattDescriptor> descriptors = characteristic.getDescriptors();
                for (BluetoothGattDescriptor descriptor: descriptors) {
+                    permission = ((characteristic.getKeySize() - 7) << 12)
+                                        + descriptor.getPermissions();
                    mService.addDescriptor(mServerIf,
-                        new ParcelUuid(descriptor.getUuid()),
-                        descriptor.getPermissions());
+                        new ParcelUuid(descriptor.getUuid()), permission);
                }
            }