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

Commit 1b9f8f75 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "PBAP: Return sim contact size with cursor.getCount" into tm-dev am:... 

Merge "PBAP: Return sim contact size with cursor.getCount" into tm-dev am: 57347dda am: 5f4d643a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/18185962



Change-Id: I7dde3dfce96444b9cb6ee7cdfac0efc1b9990b2e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 435c0da4 5f4d643a

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

+2 −2
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ public class BluetoothPbapSimVcardManager { 
        try {

            contactCursor = mContentResolver.query(myUri, SIM_PROJECTION, null,null, null);

            if (contactCursor != null) {

                size = contactCursor.getCount() +1;  //always has the 0.vcf

                size = contactCursor.getCount();

            }

        } finally {

            if (contactCursor != null) {
@@ -397,7 +397,7 @@ public class BluetoothPbapSimVcardManager { 
                String vcard = composer.createOneEntry(vcardType21);

                if (vcard == null) {

                    Log.e(TAG, "Failed to read a contact. Error reason: "

                            + composer.getErrorReason());

                            + composer.getErrorReason() + ", count:" + count);

                    return ResponseCodes.OBEX_HTTP_INTERNAL_ERROR;

                }

                buffer.onEntryCreated(vcard);