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

Commit 8382eedd authored by Jaikumar Ganesh's avatar Jaikumar Ganesh Committed by Android Git Automerger
Browse files

am 3af22033: Merge change I8b791d4f into eclair 

Merge commit '3af22033' into eclair-mr2

* commit '3af22033':
  Don't send default phone number for 0.vcf card.
parents fbef02e8 3af22033

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

+0 −4
Original line number Diff line number Diff line
@@ -421,10 +421,6 @@ public class BluetoothPbapService extends Service { 
        TelephonyManager tm = (TelephonyManager)getSystemService(Context.TELEPHONY_SERVICE);

        if (tm != null) {

            sLocalPhoneNum = tm.getLine1Number();

            if (TextUtils.isEmpty(sLocalPhoneNum)) {

                // Default number (000000) should be ok

                sLocalPhoneNum = this.getString(R.string.defaultnumber);

            }

            sLocalPhoneName = tm.getLine1AlphaTag();

            if (TextUtils.isEmpty(sLocalPhoneName)) {

                sLocalPhoneName = this.getString(R.string.localPhoneName);