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

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

Merge "Set number as "Unknown" for private numbers." into kraken

parents 92d66228 05149b33

android/app/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -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" -->

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

+6 −1
Original line number Diff line number Diff line
@@ -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)) {