Merge "Add Support for AVRCP Controller Feature"
diff --git a/src/org/codeaurora/bluetooth/pbapclient/BluetoothPbapCard.java b/src/org/codeaurora/bluetooth/pbapclient/BluetoothPbapCard.java
index 21d9371..e7e77a9 100644
--- a/src/org/codeaurora/bluetooth/pbapclient/BluetoothPbapCard.java
+++ b/src/org/codeaurora/bluetooth/pbapclient/BluetoothPbapCard.java
@@ -63,7 +63,10 @@
* format is as for vCard N field, so we have up to 5 tokens: LastName;
* FirstName; MiddleName; Prefix; Suffix
*/
- String[] parsedName = name.split(";", 5);
+ String[] parsedName = new String[0];
+
+ if ((name != null) && (!(name.isEmpty())))
+ parsedName = name.split(";", 5);
lastName = parsedName.length < 1 ? null : parsedName[0];
firstName = parsedName.length < 2 ? null : parsedName[1];