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

Commit 08f5ce60 authored by Smriti Gupta's avatar Smriti Gupta Committed by Linux Build Service Account
Browse files

PBAP: Add Bug fixes from kk

This patch is  squashed commit of the following:

commit d2bc733a1bc90e1173c34e75475f0f7840ea6b92
Author: Smriti Gupta <smritig@codeaurora.org>
Date:   Thu Dec 19 13:31:06 2013 +0530

    PBAP: Remove body header when it is not needed

    This change will remove the body header when
    the user is asking for the size and not the body.

    Change-Id: I8de1a9db0ac64dac3e0d0cf680814ef200fa11a0
    CRs-Fixed: 554222

commit c79e8c67d8c87346712cf714c90aa9ea95c2d627
Author: Smriti Gupta <smritig@codeaurora.org>
Date:   Thu Oct 10 12:57:23 2013 +0530

    PBAP: Remove BODY header from PSE's response to PB size request

    Modified the code so that PSE will not respond with a
    Body header when being asked for the size of Phonebook
    with max list count set to 0.

    Change-Id: Ib297bd5fe18179a390e3d2b223fb898a6c50ba57
    CRs-Fixed: 554222
    (cherry picked from commit e0599842a75517b7ef29e1517741760022a9e5ac)
    (cherry picked from commit 6763b280ad03a10428321cd5c176063b8fd2686a)
    (cherry picked from commit 34f1f17e1ff9bec5b7de93ecd16b91bf0cea2c5b)

Conflicts:
	src/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
	src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java

Change-Id: Id584ac29655d92da6a183a1fde63dbd3a48c1c72
parent 70097548
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment