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

Commit 64e169af authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Automerger Merge Worker
Browse files

Merge "resolve merge conflicts of 132a5027 to... 

Merge "resolve merge conflicts of 132a5027 to rvc-qpr-dev-plus-aosp" into rvc-qpr-dev-plus-aosp am: 9dd3a7b6 am: d7f32dc5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13431733

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0454f3a507f867ccbc9fa4c197991713bdddd63
parents 993f085d d7f32dc5

core/java/android/bluetooth/BluetoothHeadset.java

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public final class BluetoothHeadset implements BluetoothProfile { 


    /**

     * Intent used to broadcast the change in the Audio Connection state of the

     * HDP profile.

     * HFP profile.

     *

     * <p>This intent will have 3 extras:

     * <ul>