commit 599efc3aa34351e02bfa6e8b9e3fd530b8d9c632
author Matthew Xie <mattx@google.com> Wed Apr 03 21:58:33 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 03 22:00:07 2013 +0000
tree 837508fd88f15e55fe89a94383264c528184f620
parent 205d380bdc69ade94dcc05f54dedbf186783cfb3
parent 6f0ed128e46d723c82a2be1d5a45beaf302a2cb1

Merge "Fix minor LE descriptor permissions issue" into jb-mr2-dev

core/java/android/bluetooth/BluetoothGattServer.java

diff --git a/core/java/android/bluetooth/BluetoothGattServer.java b/core/java/android/bluetooth/BluetoothGattServer.java
index d1f4b82..644c619b 100644
--- a/core/java/android/bluetooth/BluetoothGattServer.java
+++ b/core/java/android/bluetooth/BluetoothGattServer.java
@@ -554,9 +554,10 @@
 
                 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);
                 }
             }