Bug: 143604331
Test: net_test_stack_gatt_native

Change-Id: I88704d74ba0c265872fbfd20c8bcd3bc1dd60360
(cherry picked from commit af0919f967eef7fffaf698fa0a30f0efe7d941b5)

Authentication is failed between Android Q and Android P or earlier when derived link key is used.

Repro steps:
1. Try to LE connect & pair(LE secure connection) with Android P device from Android Q device
2. Try to connect PAN from Android Q device to Android P device
3. Connection failed

This issue is caused by the following change.
https://android.googlesource.com/platform/system/bt/+/fc22b0f43849362bdd958cc518d4e4e54b654c8c

This fix just reverts removed line from the previous change.
Bug: 143940249
Change-Id: I5d18cdd76b6c436dad010caf514ab0d78997f091

[automerger skipped] Merge "While AVDT opened or its AVRC_TIMER_EVT expired, it is no needed to start the 2nd AVDT stream" into qt-qpr1-dev am: 728f3045 -s ours

am skip reason: Change-Id I75f39801e9779ee55fa574e30051e01966c61ea3 with SHA-1 ff12fc04 is in history

Change-Id: I182a3d57dca6c055487dc1cbd659e53eaab0f111

Merge "While AVDT opened or its AVRC_TIMER_EVT expired, it is no needed to start the 2nd AVDT stream" into qt-qpr1-dev

Since the HF incoming connection and the HF outgoing connection use the
same HF control block (p_scb) at the same time, the case will cause the
btif_hf_cb flag going wrong due to collision. Then it will trigger a
crash due to a check failure when executing BTA_AG_OPEN_EVT. The patch
will ignore the outgoing connection when the connection
collision is happening.

Bug: 143128949
Test: manual

Change-Id: Id5495bd3ecb1ed9e03de5bd74a61ab102604eaae
Merged-In: Id5495bd3ecb1ed9e03de5bd74a61ab102604eaae

Bug: 142878416
Test: net_test_btif_rc

Change-Id: Ia263bd5c863644f2adde759a103d79b812a9a5de
(cherry picked from commit e5dd9c735a30188286c7c9b88c247e4f629bdd54)

Bug: 141618611
Test: net_test_hci_native

Change-Id: I70a318b05d7781ddf8f82d7922a8ee7afc8d2e9f
(cherry picked from commit 6e25c5d81c4a43c2794a605c9fc8a194f37889af)

Bug: 142563377
Test: Manual atest AdapterServiceTest

Change-Id: I46d1c1d5bf0c8beea1f46b1024cbd5ceb9c0b562
Merged-In: I46d1c1d5bf0c8beea1f46b1024cbd5ceb9c0b562
(cherry picked from commit 35292e66ecf1508ee64ef76ae297245fb157ff54)

When the encoder interval is 20 milliseconds per tick for {44.1 kHz /
16 bits per sample / Stereo}, there were around three microseconds shift
every tick, but would cause one SBC frame mismatched after 20 seconds.
Here try to adjust the timeline to increase the accuracy by following
methods:

1. add the remainder back to the timeline when converting the time
   period to data size.
2. change the timestamp to be presented by values in 1/10 microseconds.

Bug: 149546181
Test: manually
Change-Id: Ic42b2f331628c44aa927c7b9e35562be1fa750c7
Merged-In: Ic42b2f331628c44aa927c7b9e35562be1fa750c7
(cherry picked from commit c8537f844d1c052e5c9d93981e270dd45d73a709)

When the encoder interval is 23 milliseconds per tick for {44.1 kHz /
16 bits per sample / Stereo}, 3 microseconds shift every tick would
cause one AAC frame mismatched after 180 seconds. Here try to adjust the
timeline to increase the accuracy by following methods:

1. add the remainder back to the timeline when converting the time
   period to data size.
2. change the timestamp to be presented by values in 1/10 microseconds.

Bug: 149546181
Test: manually
Change-Id: I16742042ba64a9355c39c0248be9208567312a9f
Merged-In: I16742042ba64a9355c39c0248be9208567312a9f
(cherry picked from commit bae2582df32576f8e95aa78f039fcfdecc962086)

[automerger skipped] GattServcer: Check invalid offset am: 1c12e817 am: 20a9d871 -s ours am: 49281122 -s ours am: 0421ad1e -s ours am: 98744641 -s ours am: c1277b2b -s ours

am skip reason: Change-Id I0396380f431cdb7f91c78db6de9043ea0f373dfe with SHA-1 cdc76789 is in history

Change-Id: I5fa2ab47a1e3bdfe51063e04dc916b1ca25bfb73

[automerger skipped] GattServcer: Check invalid offset am: 1c12e817 am: 20a9d871 -s ours am: 49281122 -s ours am: 0421ad1e -s ours am: 98744641 -s ours

am skip reason: Change-Id I0396380f431cdb7f91c78db6de9043ea0f373dfe with SHA-1 cdc76789 is in history

Change-Id: I0001be297b99dd938b255af6c0986b05236c3895

[automerger skipped] GattServcer: Check invalid offset am: 1c12e817 am: 20a9d871 -s ours am: 49281122 -s ours am: 0421ad1e -s ours

am skip reason: Change-Id I0396380f431cdb7f91c78db6de9043ea0f373dfe with SHA-1 cdc76789 is in history

Change-Id: I9583370dee55f32ebda4a009c1a9a2b5586b1c95

[automerger skipped] GattServcer: Check invalid offset am: 1c12e817 am: 20a9d871 -s ours am: 49281122 -s ours

am skip reason: Change-Id I0396380f431cdb7f91c78db6de9043ea0f373dfe with SHA-1 cdc76789 is in history

Change-Id: I19ce865f59ffe8bee30c81401a480d1b32ee632b

am skip reason: Change-Id I0396380f431cdb7f91c78db6de9043ea0f373dfe with SHA-1 cdc76789 is in history

Change-Id: Iba77996d7a5acdbee2865868d506634620ccf793

Change-Id: I1d3aae196fb82155b88e2377e96670797f228f8a

[automerger skipped] GattServcer: Check invalid offset am: cdc76789 -s ours am: 3bf42ee5 -s ours am: aac60fc9 -s ours am: cc0a291b -s ours

am skip reason: Change-Id I97e2c3ae15fccc482d07d8d621c455cc74900cfd with SHA-1 afb0e3bb is in history

Change-Id: I063f752ce3f34ac028dd420fd7f5ae2d2c4e0931

[automerger skipped] GattServcer: Check invalid offset am: cdc76789 -s ours am: 3bf42ee5 -s ours am: aac60fc9 -s ours

am skip reason: Change-Id I97e2c3ae15fccc482d07d8d621c455cc74900cfd with SHA-1 afb0e3bb is in history

Change-Id: I498e1841598b1142881eb386ef9e46faa754cabb

[automerger skipped] GattServcer: Check invalid offset am: cdc76789 -s ours am: 3bf42ee5 -s ours

am skip reason: Change-Id I97e2c3ae15fccc482d07d8d621c455cc74900cfd with SHA-1 afb0e3bb is in history

Change-Id: Id5714e151ff13706e496b71898712b9410be7746

Test: manual
Bug: 143231677
Merged-In: I0396380f431cdb7f91c78db6de9043ea0f373dfe
Merged-In: I0ca22e7c60292d61c758120c1cd67f6e6edd8ae8
Change-Id: I0ca22e7c60292d61c758120c1cd67f6e6edd8ae8

am skip reason: Change-Id I97e2c3ae15fccc482d07d8d621c455cc74900cfd with SHA-1 afb0e3bb is in history

Change-Id: Ied357d149b40fd00da201593f9d3e16c899fa7ca

Test: run atest on unittests
Bug: 142563377

Change-Id: I05739258479a67d47550a6cb1db1c6f8c1ff3e98
Merged-In: I05739258479a67d47550a6cb1db1c6f8c1ff3e98
(cherry picked from commit b12ac65535cda6a4477738ff3e060e6e9be4c08b)

Test: manual
Bug: 143231677
Change-Id: I0396380f431cdb7f91c78db6de9043ea0f373dfe
Merged-In: I97e2c3ae15fccc482d07d8d621c455cc74900cfd
Merged-In: I0ca22e7c60292d61c758120c1cd67f6e6edd8ae8

[automerger skipped] GattServcer: Check invalid offset am: afb0e3bb am: a594bbcb am: 627f84f7 -s ours
am skip reason: Change-Id I0ca22e7c60292d61c758120c1cd67f6e6edd8ae8 with SHA-1 2e9e1463 is in history

Change-Id: Iad6db18bc63cd6463c983b247e45aa5a6bec3265

Change-Id: I1d497b86f89219c8a8885f17bf969a670c6433b6

Change-Id: I84a04a3671ff7d501bf9bfb483830ec48d30ce62

Add onFactoryReset into IBluetoothManager interface.

Bug: 110181479
Test: manual
Change-Id: Ic36ffd63c376f84e3c9f0388820da86f63465c8f

There were 2 cases to start the 2nd stream automatically by the stack:

* When the 2nd AVDT opened, the stack would check the 1st stream state
  to determinate the 2nd should be starting or not.
* While the AVRC timer which was fired after AVDT opened was expired,
  the stack would open the AVRC and start the 2nd stream if the 1st was
  started.

Both of them are unnecessary since all the stream must be controlled by
the upper layer. We currently support an active device only, and the
2nd stream will be tracked as remote triggered and suspended immediately.
To samplize the behavior, it is better to not start the 2nd stream
automatically by the stack.

Bug: 132146974
Bug: 150797902
Test: manual
Change-Id: I75f39801e9779ee55fa574e30051e01966c61ea3
Merged-In: I75f39801e9779ee55fa574e30051e01966c61ea3
(cherry picked from commit ff12fc04)

Test: manual
Bug: 143231677
Change-Id: I97e2c3ae15fccc482d07d8d621c455cc74900cfd
Merged-In: I0ca22e7c60292d61c758120c1cd67f6e6edd8ae8

AAC Decoder: Use osi_free() to free buffers allocated by osi_malloc() am: 964cafb8 am: c246d06d am: 1ef9ad9d

Change-Id: Ief856194be69171831a004f1bcb283d09aba2364

Change-Id: I7f0f617b594bd6800a92d5a04e8ef0ce0f285cd2

Change-Id: I8fb43f7467aedd4e36237d7f355c8ed175e1e33c

Handle case when UI Handlers are invoked in different order

Bug: 150054218
Change-Id: I0f7a4fec63632771ac4ef1077e70c3f6020f6969
(cherry picked from commit 13826c81)

Mark updatable APEXes as updatable: true so that they are opted-out from
optimizations that make sense only for non-updatable modules; such as
symlinking to the libs in the system partition.

Bug: 149805758
Test: m and check that there is no symlink from the APEX to the system
partition.

Change-Id: Id21fa176acce4800fb8e6c723007f6a4aa2d1bab

Merge "Add functions to integrate the full spec of LDAC SNK" am: 4c7c6bb5 am: 1d3e9e6b am: 1b7a7189

Change-Id: Ia966c7181c5ba16e03550cf4258db7ae7d608c32

Change-Id: I393265a11dab26efaf6c269e1bed75d1e071f0a5

Change-Id: I157c9b4ecf1dfa42fd6371bcfccebf5aff1f1ec5