commit 36294bfd684158211f5f4962372c63ddd0f2f859
author Jakub Pawlowski <jpawlowski@google.com> Wed Aug 17 17:00:02 2016 -0700
committer Andre Eisenbach <eisenbach@google.com> Thu Aug 18 18:25:18 2016 +0000
tree 31a8388797c012605c8d360290073303d58731e0
parent d6c9954676732f606aec199aa2dcafbe475ac7e9

Fix NPE in permissionCheck

permissionCheck can throw NPE when notification is received before
GATT database is discovered. Assume that permission is granted when
receiving notifications for unknown characteristic.

Bug: 30853729
Change-Id: I02aab1197b036584b2021d76f290c2c57db24a19

src/com/android/bluetooth/gatt/GattService.java

diff --git a/src/com/android/bluetooth/gatt/GattService.java b/src/com/android/bluetooth/gatt/GattService.java
index 7a164c6..854e9ae 100644
--- a/src/com/android/bluetooth/gatt/GattService.java
+++ b/src/com/android/bluetooth/gatt/GattService.java
@@ -222,6 +222,7 @@
 
     boolean permissionCheck(int connId, int handle) {
         List<BluetoothGattService> db = gattClientDatabases.get(connId);
+        if (db == null) return true;
 
         for (BluetoothGattService service : db) {
             for (BluetoothGattCharacteristic characteristic: service.getCharacteristics()) {