Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d54a9ac9 authored by Jaikumar Ganesh's avatar Jaikumar Ganesh Committed by Android (Google) Code Review
Browse files

Merge "Revert "pullVcard of unknown phone number""

parents 01b4ceae 2f429e31

src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java

+2 −9
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
package com.android.bluetooth.pbap;



import com.android.bluetooth.R;

import com.android.internal.telephony.CallerInfo;



import android.content.ContentResolver;

import android.content.Context;
@@ -144,19 +143,13 @@ public class BluetoothPbapCallLogComposer { 
        if (TextUtils.isEmpty(name)) {

            name = mCursor.getString(NUMBER_COLUMN_INDEX);

        }

        if (CallerInfo.UNKNOWN_NUMBER.equals(name) || CallerInfo.PRIVATE_NUMBER.equals(name) ||

                CallerInfo.PAYPHONE_NUMBER.equals(name)) {

            name = "";

        }

        final boolean needCharset = !(VCardUtils.containsOnlyPrintableAscii(name));

        builder.appendLine(VCardConstants.PROPERTY_FN, name, needCharset, false);

        builder.appendLine(VCardConstants.PROPERTY_N, name, needCharset, false);



        String number = mCursor.getString(NUMBER_COLUMN_INDEX);

        if (CallerInfo.UNKNOWN_NUMBER.equals(name) ||

                CallerInfo.PRIVATE_NUMBER.equals(name) ||

                CallerInfo.PAYPHONE_NUMBER.equals(name)) {

            name = mContext.getString(R.string.unknownNumber);

        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);

src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java

+1 −7
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ import android.text.TextUtils; 
import android.util.Log;



import com.android.bluetooth.R;

import com.android.internal.telephony.CallerInfo;

import com.android.vcard.VCardComposer;

import com.android.vcard.VCardConfig;
@@ -184,11 +183,6 @@ public class BluetoothPbapVcardManager { 
                    if (TextUtils.isEmpty(name)) {

                        // name not found,use number instead

                        name = callCursor.getString(CALLS_NUMBER_COLUMN_INDEX);

                        if (CallerInfo.UNKNOWN_NUMBER.equals(name) ||

                                CallerInfo.PRIVATE_NUMBER.equals(name) ||

                                CallerInfo.PAYPHONE_NUMBER.equals(name)) {

                            name = mContext.getString(R.string.unknownNumber);

                        }

                    }

                    list.add(name);

                }