Set number as "Unknown" for private numbers.

Change-Id: I54bb9595913c90e72eef659627d95bb63398e84a

diff --git a/res/values/strings.xml b/res/values/strings.xml
index a5b5825..f2ac62a 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -38,6 +38,9 @@
     <!-- string for "unknown device" -->
     <string name="unknown_device">Unknown device</string>
 
+    <!-- string for "unknown" phone number" -->
+    <string name="unknownNumber">Unknown</string>
+
     <!-- string for "the title of airplane mode error" -->
     <string name="airplane_error_title">Airplane mode</string>
     <!-- string for "error message in airplane mode" -->

diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java b/src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
index 04ad1d4..3fc216f 100755 (executable)
--- a/src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
@@ -15,6 +15,8 @@
  */
 package com.android.bluetooth.pbap;
 
+import com.android.bluetooth.R;
+
 import android.content.ContentResolver;
 import android.content.Context;
 import android.database.Cursor;
@@ -198,7 +200,10 @@ public class BluetoothPbapCallLogComposer {
         builder.appendLine(VCardConstants.PROPERTY_FN, name, needCharset, false);
         builder.appendLine(VCardConstants.PROPERTY_N, name, needCharset, false);
 
-        final String number = mCursor.getString(NUMBER_COLUMN_INDEX);
+        String number = mCursor.getString(NUMBER_COLUMN_INDEX);
+        if (number.equals("-1")) {
+            number = mContext.getString(R.string.unknownNumber);
+        }
         final int type = mCursor.getInt(CALLER_NUMBERTYPE_COLUMN_INDEX);
         String label = mCursor.getString(CALLER_NUMBERLABEL_COLUMN_INDEX);
         if (TextUtils.isEmpty(label)) {