summaryrefslogtreecommitdiffstats
path: root/src/com/android/bluetooth/map/BluetoothMapContent.java
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-03-30 11:51:31 -0700
committerSteve Kondik <steve@cyngn.com>2016-03-30 11:51:31 -0700
commit8c5b9feba472e4532b6d151a402c8ad3ebd947a7 (patch)
tree709589743ad8fd9e3dcfa2b0dbb5f8ba981ac16e /src/com/android/bluetooth/map/BluetoothMapContent.java
parentd7199f6c73b0c927f694967163f33257d6e5199f (diff)
parente6fae29795ff64060044d89bb6213f13042008ff (diff)
downloadandroid_packages_apps_Bluetooth-8c5b9feba472e4532b6d151a402c8ad3ebd947a7.tar.gz
android_packages_apps_Bluetooth-8c5b9feba472e4532b6d151a402c8ad3ebd947a7.tar.bz2
android_packages_apps_Bluetooth-8c5b9feba472e4532b6d151a402c8ad3ebd947a7.zip
Merge branch 'LA.BF.1.1.3_rb1.11' of git://codeaurora.org/platform/packages/apps/Bluetooth into cm-13.0
Diffstat (limited to 'src/com/android/bluetooth/map/BluetoothMapContent.java')
-rw-r--r--src/com/android/bluetooth/map/BluetoothMapContent.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/bluetooth/map/BluetoothMapContent.java b/src/com/android/bluetooth/map/BluetoothMapContent.java
index 62c90a9bc..2d27c6b87 100644
--- a/src/com/android/bluetooth/map/BluetoothMapContent.java
+++ b/src/com/android/bluetooth/map/BluetoothMapContent.java
@@ -1242,6 +1242,8 @@ public class BluetoothMapContent {
}
if (subject != null && subject.length() > subLength) {
subject = subject.substring(0, subLength);
+ } else if (subject == null ) {
+ subject = "";
}
if (V) Log.d(TAG, "setSubject: " + subject);
e.setSubject(subject);