commit 0586a55f699b34dfa62602595826235d787bdbd2
author Ashwini Munigala <AshwiniM@codeaurora.org> Thu Nov 21 11:09:17 2013 +0530
committer broodplank <guichardflorent@gmail.com> Thu Apr 10 01:33:43 2014 +0200
tree f2536691740b4012726234e830f0c66e285164d4
parent ff8210e41263db9e99fd2c9b498e17d2dcffed83

MAP: Set Empty name or address for unknown values in GetMessageListing.

Set Empty sender or recipient name and address values to indicate
info not available from MSE in GetMessageListing response.
Current implemenation to skip the entire feild in response doesnot
mark the uniformity for values being fetched from telephony or
phone book databases.

Change-Id: I44e2f61572607349ec20ec1efcc6c44abe084b83

src/com/android/bluetooth/map/BluetoothMapContent.java

diff --git a/src/com/android/bluetooth/map/BluetoothMapContent.java b/src/com/android/bluetooth/map/BluetoothMapContent.java
index 1108a48..a7a11d1 100644
--- a/src/com/android/bluetooth/map/BluetoothMapContent.java
+++ b/src/com/android/bluetooth/map/BluetoothMapContent.java
@@ -485,7 +485,7 @@
     private void setRecipientAddressing(BluetoothMapMessageListingElement e, Cursor c,
         FilterInfo fi, BluetoothMapAppParams ap) {
         if ((ap.getParameterMask() & MASK_RECIPIENT_ADDRESSING) != 0) {
-            String address = null;
+            String address = "";
             if (fi.msgType == FilterInfo.TYPE_SMS) {
                 int msgType = c.getInt(c.getColumnIndex(Sms.TYPE));
                 if (msgType == 1) {
@@ -505,7 +505,7 @@
     private void setRecipientName(BluetoothMapMessageListingElement e, Cursor c,
         FilterInfo fi, BluetoothMapAppParams ap) {
         if ((ap.getParameterMask() & MASK_RECIPIENT_NAME) != 0) {
-            String name = null;
+            String name = "";
             if (fi.msgType == FilterInfo.TYPE_SMS) {
                 int msgType = c.getInt(c.getColumnIndex(Sms.TYPE));
                 if (msgType != 1) {
@@ -547,7 +547,7 @@
     private void setSenderName(BluetoothMapMessageListingElement e, Cursor c,
         FilterInfo fi, BluetoothMapAppParams ap) {
         if ((ap.getParameterMask() & MASK_SENDER_NAME) != 0) {
-            String name = null;
+            String name = "";
             if (fi.msgType == FilterInfo.TYPE_SMS) {
                 int msgType = c.getInt(c.getColumnIndex(Sms.TYPE));
                 if (msgType == 1) {
@@ -677,7 +677,7 @@
     }
 
     private String getContactNameFromPhone(String phone) {
-        String name = null;
+        String name = "";
 
         Uri uri = Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI,
             Uri.encode(phone));