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

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

Merge "pullVcard of unknown phone number"

parents d54a9ac9 77ba5f66

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

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

package com.android.bluetooth.pbap;





import com.android.bluetooth.R;

import com.android.bluetooth.R;

import com.android.internal.telephony.CallerInfo;





import android.content.ContentResolver;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Context;
@@ -141,14 +142,21 @@ public class BluetoothPbapCallLogComposer { 
        final VCardBuilder builder = new VCardBuilder(vcardType);

        final VCardBuilder builder = new VCardBuilder(vcardType);

        String name = mCursor.getString(CALLER_NAME_COLUMN_INDEX);

        String name = mCursor.getString(CALLER_NAME_COLUMN_INDEX);

        if (TextUtils.isEmpty(name)) {

        if (TextUtils.isEmpty(name)) {

            name = mCursor.getString(NUMBER_COLUMN_INDEX);

            name = "";

        }

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

                CallerInfo.PAYPHONE_NUMBER.equals(name)) {

            // setting name to "" as FN/N must be empty fields in this case.

            name = "";

        }

        }

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

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

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

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

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

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





        String number = mCursor.getString(NUMBER_COLUMN_INDEX);

        String number = mCursor.getString(NUMBER_COLUMN_INDEX);

        if (number.equals("-1")) {

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

                CallerInfo.PRIVATE_NUMBER.equals(number) ||

                CallerInfo.PAYPHONE_NUMBER.equals(number)) {

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

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

        }

        }

        final int type = mCursor.getInt(CALLER_NUMBERTYPE_COLUMN_INDEX);

        final int type = mCursor.getInt(CALLER_NUMBERTYPE_COLUMN_INDEX);

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

+7 −1
Original line number Original line Diff line number Diff line
@@ -49,6 +49,7 @@ import android.util.Log; 
import com.android.bluetooth.R;

import com.android.bluetooth.R;

import com.android.vcard.VCardComposer;

import com.android.vcard.VCardComposer;

import com.android.vcard.VCardConfig;

import com.android.vcard.VCardConfig;

import com.android.internal.telephony.CallerInfo;





import java.io.IOException;

import java.io.IOException;

import java.io.OutputStream;

import java.io.OutputStream;
@@ -183,6 +184,11 @@ public class BluetoothPbapVcardManager { 
                    if (TextUtils.isEmpty(name)) {

                    if (TextUtils.isEmpty(name)) {

                        // name not found, use number instead

                        // name not found, use number instead

                        name = callCursor.getString(CALLS_NUMBER_COLUMN_INDEX);

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

                    list.add(name);

                }

                }