commit 24e80c4a41c6ae1699618edb79aac22cf2f61d36
author greg_huang <greg_huang@htc.com> Tue Jun 13 12:07:27 2017 +0800
committer Jack He <siyuanh@google.com> Wed Jul 05 20:52:28 2017 +0000
tree 49dfdfb985adb5d1e1c399dc0321afdbc952ad47
parent 9fa0879591687b2c6efa7c838d61ef232a28ac2b

PBAP: Check for null in isNameMatchTarget

Bug: 62361842
Test: make, PTS test by vendor
Change-Id: Ie9861931c93cb0ff26f86a2fdfa5aa1e3083d81a

android/app/src/com/android/bluetooth/pbap/BluetoothPbapObexServer.java

diff --git a/android/app/src/com/android/bluetooth/pbap/BluetoothPbapObexServer.java b/android/app/src/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
index 4aeea0e..d112bfd 100644
--- a/android/app/src/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
+++ b/android/app/src/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
@@ -478,6 +478,7 @@
     }
 
     private boolean isNameMatchTarget(String name, String target) {
+        if (name == null) return false;
         String contentTypeName = name;
         if (contentTypeName.endsWith(".vcf")) {
             contentTypeName = contentTypeName