system-bt

Fork

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into oc-dev am: 421f1492da am: c0f88cbbfd am: fa24cbf097 am: 7625320871
am: d3d63acf58

Change-Id: Ia40d5f14140399169cded615cbe1fba5a438f50b

[automerger skipped] [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0 am: db47d7e348 am: 6976e5f214 skipped: 575b8c810b am: 5b7685e7a2 am: f4da01925c am: 0a1f845e2a -s ours am: 840a9ba63e -s ours
am: 36c6a3069a

Change-Id: Ibe83621a1cbb8e7be9bbdfecf5a8658b09525d75

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into oc-dev am: 421f1492da am: c0f88cbbfd am: fa24cbf097
am: 7625320871

Change-Id: I4e49782d45cd3132456019979e20e8c63fe58def

[automerger skipped] [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0 am: db47d7e348 am: 6976e5f214 skipped: 575b8c810b am: 5b7685e7a2 am: f4da01925c am: 0a1f845e2a -s ours
am: 840a9ba63e -s ours
am skip reason: subject contains skip directive

Change-Id: Ib56723082e3f9696d84423d254b5830af5e19253

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into oc-dev am: 421f1492da am: c0f88cbbfd
am: fa24cbf097

Change-Id: I332b22ee718458d95df4e549238244f3117aa294

[automerger skipped] [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0 am: db47d7e348 am: 6976e5f214 skipped: 575b8c810b am: 5b7685e7a2 am: f4da01925c
am: 0a1f845e2a -s ours
am skip reason: subject contains skip directive

Change-Id: Ice9aadfba47ba6e146de0123f17d7703b650605a

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev am: 1ab9bad8f3 -s ours am: cc98ca6dd2 -s ours
am: f92efc538b

Change-Id: Iae50a817a62c92c3455477cf8576471ca86429c3

[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 9d5a28a536 -s ours am: 4a0d26a8f3 -s ours
am: 2bd5b33135

Change-Id: I4094119aabecb737afce2a82a09d4711ddf52cb3

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev am: e488319d82 -s ours
am: c7ee86a352

Change-Id: I8a5f0c4846a71dd0ee1146ac7b5a4f7208cf9fa9

DO NOT MERGE Separate SDP procedure from bonding state (1/2)

- Do not stay in bonding state if the device is paried but still
discovering service.
- Report BOND_BONDED to Java after authentication for a classic
Bluetooth device is completed.
- Send BONDING event to Java when static identity address is
first obtained during crosskey pairing
- Send BONDING event to Java for the initial random address
before send BONDED event
- Do not send bond event for static identity address when SDP is done.
- Make sure pairing control block always get cleaned up when both SDP
and pairing are done
- Send empty UUIDs to Java layer to unblock bonding intent broadcast
when SDP fails

Bug: 79703832
Test: runtest bluetooth, regression test
Change-Id: I60d8883e6d095b440cce49686a2049c8b5660235
Merged-In: I8a98ba2178039e25c65fc701855066a8788312e6

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into oc-dev am: 421f1492da
am: c0f88cbbfd

Change-Id: I5f81bb5a561e3da0a06d4d75f99f7894648b82d6

[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0 am: db47d7e348 am: 6976e5f214 skipped: 575b8c810b am: 5b7685e7a2
am: f4da01925c

Change-Id: I548d7448fa6562b01ca6f8d7b63621f17679945c

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev am: 1ab9bad8f3 -s ours
am: cc98ca6dd2 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic22afab361dac6bbdde1f7c792886197b62d873d

[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 9d5a28a536 -s ours
am: 4a0d26a8f3 -s ours
am skip reason: subject contains skip directive

Change-Id: I91b43f29574e5f14706de654f2449a765adbb119

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev
am: e488319d82 -s ours
am skip reason: subject contains skip directive

Change-Id: I41fb2cdaaab4b9ddab2aa5465a33e02523676df8

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into oc-dev
am: 421f1492da

Change-Id: I7644ef835cc0177d110de369dfae0a01225bdcbb

[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0 am: db47d7e348 am: 6976e5f214 skipped: 575b8c810b
am: 5b7685e7a2

Change-Id: I13263a937d23bbfd624afcb92f5a4b76f240a258

Hearing Aid: properly track audio Suspend/Resume

When audio is suspended or resumed, we are notified by OnAudioSuspend or
OnAudioResume callback. Unfortunately, when we are the one triggering
the HearingAidAudioSource::Stop(), we would not receive the suspend
callback. This is causing HA to believe audio is being streamed when
it's not.

This patch fixes that by setting audio_running to false when we make
call to Stop()

Bug: 132793574
Test: Play audio, restart Hearing Aid, verify START command is not being
sent

Change-Id: I3c4551114ac275ea8c72f64a8d036373429acd6d

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev
am: 1ab9bad8f3 -s ours
am skip reason: subject contains skip directive

Change-Id: I3bc81925f4a8a1f8d467d348fa5844fd1230cf6c

[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2)
am: 9d5a28a536 -s ours
am skip reason: subject contains skip directive

Change-Id: I09c517978113a8837c1cbccab61fa75eb7f199fd

Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev

Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into nyc-mr2-dev

* changes:
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0 am: db47d7e348 am: 6976e5f214
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0 am: db47d7e348
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719
DO NOT MERGE Separate SDP procedure from bonding state (1/2)

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into cw-f-dev

* changes:
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0 am: db47d7e348
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719
DO NOT MERGE Separate SDP procedure from bonding state (1/2)

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into nyc-mr1-dev

* changes:
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719
DO NOT MERGE Separate SDP procedure from bonding state (1/2)

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into nyc-dr1-dev

* changes:
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719
DO NOT MERGE Separate SDP procedure from bonding state (1/2)

Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into nyc-dev

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into oc-dev

* changes:
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0 am: db47d7e348 am: 6976e5f214 skipped: 575b8c810b
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0 am: db47d7e348 am: 6976e5f214
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0 am: db47d7e348
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719 am: fffbd1d3b0
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 553eb90719
DO NOT MERGE Separate SDP procedure from bonding state (1/2)

[automerger skipped] Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into oc-dev am: 4823241553 am: 9cf0c2c6d2 am: 6f51f61aab -s ours am: e46949a6e4 -s ours
am: 14a23759f6

Change-Id: I98a220f040b32092cee5434c91d56ee8558b2c83

[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: ee34c562b2 am: 4fcab76aec am: e89aa63902 -s ours am: 4bf75ac4ad -s ours
am: 2da31340ec

Change-Id: Ib97410acc9ed4640c10115a7421303bd9ff3a385