git.osdn.net Git - android-x86/system-bt.git/log

OSDN Git Service

(root) / android-x86 / system-bt.git / log

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Mar 2020 03:33:52 +0000 (03:33 +0000)]

Merge "Fix bluetooth can't turn off during network reset (3/3)" into qt-qpr1-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Mar 2020 03:29:10 +0000 (03:29 +0000)]

Merge "avrc: Validating msg size before accessing fields" into qt-qpr1-dev

commit | commitdiff | tree

Joseph Pirozzo [Thu, 19 Mar 2020 17:54:22 +0000 (17:54 +0000)]

Merge changes from topic "AutomotiveQBTSync" into qt-qpr1-dev

* changes:
  AVRCP Controller manage focus while disconnected
  AVRCP Controller refresh track data on Interim
  AVRCP Controller get play status
  ServiceDiscoveryProtocol DB Full
  AVRCP Position Changed Notification
  DO NOT MERGE: AVRCP Controller Shuffle/Repeat support

commit | commitdiff | tree

More Kuo [Thu, 19 Mar 2020 02:05:39 +0000 (02:05 +0000)]

Merge "Notify remote name failed for LE device" into qt-qpr1-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 18 Mar 2020 22:52:14 +0000 (22:52 +0000)]

Merge "Make sure only valid packet fields are accessed in VendorPacketHandler" into qt-qpr1-dev

commit | commitdiff | tree

More Kuo [Fri, 13 Mar 2020 06:43:29 +0000 (14:43 +0800)]

Notify remote name failed for LE device

When cancel discovery for LE device in BTA_DM_DISCOVER_ACTIVE state,
there is no notification to indicate the remote name request of LE
device is cancelled and change the search state back to
BTA_DM_SEARCH_IDLE state. Call btm_inq_rmt_name_failed_cancelled()
to notify in this situation.

Bug: 146840780
Test: Manual
Change-Id: I4ab2a2f413e4ac19765476039f4127ce045e84d9

commit | commitdiff | tree

Joseph Pirozzo [Mon, 18 Nov 2019 19:44:37 +0000 (11:44 -0800)]

AVRCP Controller manage focus while disconnected

If Audio focus is lost(or gained) while A2DP is not connected there is the
possibility for states to get out of sync. Removing the check for
connectivity ensures that the state can be properly managed.

Bug: 144082798
Test: Disconnect BT device, lose audio focus, verify
btif_a2dp_sink_set_focus_state_event state gets updated.

Change-Id: If5802418f6069dbc72824745307342776175d9d8
(cherry picked from commit 7661c2a8b90bee7edcf7c1279abe06ed32e22a2c)

Change-Id: I22a7ee2a3e51c3dea441a6f185e1c993cd65c4a1
Merged-In: If5802418f6069dbc72824745307342776175d9d8

commit | commitdiff | tree

Joseph Pirozzo [Thu, 14 Nov 2019 00:02:06 +0000 (16:02 -0800)]

AVRCP Controller refresh track data on Interim

Upon receiving an interim track changed event fetch the now playing
track information. Resolves issues where track changes get out of sync.

Bug: 143954201
Test: connect a phone and change tracks rapidly on phone.
Change-Id: I1e4ce62df6839dd2b9cf40832556a9b2608593e7
(cherry picked from commit a3d62166f685f5249b813bd110e894682c84da54)

Change-Id: Ia6cc2a7a0430d6d9e3ae6e911e3fc8834221b599
Merged-In: I1e4ce62df6839dd2b9cf40832556a9b2608593e7

commit | commitdiff | tree

Joseph Pirozzo [Mon, 21 Oct 2019 22:39:09 +0000 (15:39 -0700)]

AVRCP Controller get play status

Correct the parsing error in the GET_PLAY_STATUS message and call the
proper jni callback when it is received.

Bug: 139033614
Test: Connect AVRCP change media players, observe correct value parsed.
Change-Id: I8302b64efdd72bfa671cca5b8c512a436fa54ab3
(cherry picked from commit 86b473cae724e9db2efec9ed1ee50a71f2a2dd22)

Merged-In: 86b473cae724e9db2efec9ed1ee50a71f2a2dd22
Change-Id: I0c753fbc7bb62698cf23b9ded13497b6b60cda35
Merged-In: I8302b64efdd72bfa671cca5b8c512a436fa54ab3

commit | commitdiff | tree

Joseph Pirozzo [Tue, 1 Oct 2019 21:13:29 +0000 (14:13 -0700)]

ServiceDiscoveryProtocol DB Full

Increase the size of the local SDP DB to cope with newer phones supporting
more Bluetooth profiles.

Bug: 141889288
Test: pair Bluetooth device verify no warning "SDP - DB full add_attr"
Change-Id: I823ea6e178f098a0441efde4fb7d8e7fb68e38c0
(cherry picked from commit e62a51a4d6a25de3629194bad7d1d42b739e231f)

Change-Id: I06259aa3aa9b1d034b8b60dd9dcbfffe0080bacc
Merged-In: I823ea6e178f098a0441efde4fb7d8e7fb68e38c0

commit | commitdiff | tree

Joseph Pirozzo [Fri, 28 Jun 2019 18:07:52 +0000 (11:07 -0700)]

AVRCP Position Changed Notification

Correct position change notification to be received every 2000 ms
instead of every 2000 s.

Bug: 133400561
Test: Connect to device and monitor avrcp traffic.
Change-Id: Id8a33670b207f4a9ac03da957075acbac0c7c052
(cherry picked from commit f11c6baecf498b2f407c545ab8d9dcc34cc62c4d)

Change-Id: If5324d4ef5fe20c71c7b603d648fff82b81ce550
Merged-In: Id8a33670b207f4a9ac03da957075acbac0c7c052

commit | commitdiff | tree

Joseph Pirozzo [Fri, 26 Jul 2019 19:26:01 +0000 (12:26 -0700)]

DO NOT MERGE: AVRCP Controller Shuffle/Repeat support

Fetch player settings when the addressed player changes.

Bug: 72495707
Test: AvrcpControllerStateMachineTest#testShuffle
AvrcpControllerStateMachineTest#testRepeat

Change-Id: I4df1f130dafb96708ec7a0a2c13c776affcc6318
(cherry picked from commit 60a193dfeb155aeb8428fb341737b385f8260899)

Change-Id: I944419ad0bd5e49bad8a988851c1a753c0753d01
Merged-In: I4df1f130dafb96708ec7a0a2c13c776affcc6318

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Mar 2020 04:21:17 +0000 (04:21 +0000)]

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

commit | commitdiff | tree

Automerger Merge Worker [Wed, 11 Mar 2020 00:42:51 +0000 (00:42 +0000)]

[automerger skipped] GattServcer: Check invalid offset am: 30a2860ed1 am: 2865a273f2 -s ours am: b9e373e364 -s ours am: 78003bf5ef -s ours am: 987f4b2bfe -s ours

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

Change-Id: I0001be297b99dd938b255af6c0986b05236c3895

commit | commitdiff | tree

Automerger Merge Worker [Wed, 11 Mar 2020 00:26:11 +0000 (00:26 +0000)]

[automerger skipped] GattServcer: Check invalid offset am: 30a2860ed1 am: 2865a273f2 -s ours am: b9e373e364 -s ours am: 78003bf5ef -s ours

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

Change-Id: I9583370dee55f32ebda4a009c1a9a2b5586b1c95

commit | commitdiff | tree

Automerger Merge Worker [Wed, 11 Mar 2020 00:14:09 +0000 (00:14 +0000)]

[automerger skipped] GattServcer: Check invalid offset am: 30a2860ed1 am: 2865a273f2 -s ours am: b9e373e364 -s ours

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

Change-Id: I19ce865f59ffe8bee30c81401a480d1b32ee632b

commit | commitdiff | tree

Automerger Merge Worker [Tue, 10 Mar 2020 23:58:30 +0000 (23:58 +0000)]

[automerger skipped] GattServcer: Check invalid offset am: 30a2860ed1 am: 2865a273f2 -s ours

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

Change-Id: Iba77996d7a5acdbee2865868d506634620ccf793

commit | commitdiff | tree

Automerger Merge Worker [Tue, 10 Mar 2020 23:42:03 +0000 (23:42 +0000)]

GattServcer: Check invalid offset am: 30a2860ed1

Change-Id: I1d3aae196fb82155b88e2377e96670797f228f8a

commit | commitdiff | tree

Automerger Merge Worker [Tue, 10 Mar 2020 21:39:14 +0000 (21:39 +0000)]

[automerger skipped] GattServcer: Check invalid offset am: c14c1fb864 -s ours am: e3b33dec09 -s ours am: 2dd6490cfe -s ours

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

Change-Id: I498e1841598b1142881eb386ef9e46faa754cabb

commit | commitdiff | tree

Automerger Merge Worker [Tue, 10 Mar 2020 21:22:16 +0000 (21:22 +0000)]

[automerger skipped] GattServcer: Check invalid offset am: c14c1fb864 -s ours am: e3b33dec09 -s ours

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

Change-Id: Id5714e151ff13706e496b71898712b9410be7746

commit | commitdiff | tree

Hansong Zhang [Thu, 13 Feb 2020 19:40:44 +0000 (11:40 -0800)]

GattServcer: Check invalid offset

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

commit | commitdiff | tree

Automerger Merge Worker [Tue, 10 Mar 2020 21:02:22 +0000 (21:02 +0000)]

[automerger skipped] GattServcer: Check invalid offset am: c14c1fb864 -s ours

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

Change-Id: Ied357d149b40fd00da201593f9d3e16c899fa7ca

commit | commitdiff | tree

Hansong Zhang [Thu, 13 Feb 2020 19:40:44 +0000 (11:40 -0800)]

GattServcer: Check invalid offset

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

commit | commitdiff | tree

Automerger Merge Worker [Tue, 10 Mar 2020 03:12:00 +0000 (03:12 +0000)]

GattServcer: Check invalid offset am: 7674de8fc8 am: 8b1db2dabf

Change-Id: I1d497b86f89219c8a8885f17bf969a670c6433b6

commit | commitdiff | tree

Automerger Merge Worker [Tue, 10 Mar 2020 02:51:00 +0000 (02:51 +0000)]

GattServcer: Check invalid offset am: 7674de8fc8

Change-Id: I84a04a3671ff7d501bf9bfb483830ec48d30ce62

commit | commitdiff | tree

Alain Michaud [Fri, 7 Feb 2020 01:50:52 +0000 (01:50 +0000)]

avrc: Validating msg size before accessing fields

This change adds buffer length validation during the parsing of AVRCP
browse commands.

Bug: 79945152
Test: net_test_stack
Change-Id: Icfc44f9a91fe004932e15182b1ca3ad5bdac6370
(cherry picked from commit 03bfb9e880764c1fbad3c7ce5159c295f1c6d551)

commit | commitdiff | tree

weichinweng [Thu, 5 Mar 2020 02:53:29 +0000 (10:53 +0800)]

Fix bluetooth can't turn off during network reset (3/3)

Add onFactoryReset into IBluetoothManager interface.

Bug: 110181479
Test: manual
Change-Id: Ic36ffd63c376f84e3c9f0388820da86f63465c8f
Merged-In: Ic36ffd63c376f84e3c9f0388820da86f63465c8f

commit | commitdiff | tree

Cheney Ni [Wed, 15 May 2019 06:09:49 +0000 (14:09 +0800)]

While AVDT opened or its AVRC_TIMER_EVT expired, it is no needed to start the 2nd AVDT stream

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 ba432366f9959b46e5b28198f2623ac4e32fb94a)

commit | commitdiff | tree

Hansong Zhang [Thu, 13 Feb 2020 19:40:44 +0000 (11:40 -0800)]

GattServcer: Check invalid offset

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

commit | commitdiff | tree

Automerger Merge Worker [Tue, 3 Mar 2020 23:49:37 +0000 (23:49 +0000)]

AAC Decoder: Use osi_free() to free buffers allocated by osi_malloc() am: 7a6fd5459e am: c4d6c95107

Change-Id: I7f0f617b594bd6800a92d5a04e8ef0ce0f285cd2

commit | commitdiff | tree

Automerger Merge Worker [Tue, 3 Mar 2020 23:32:21 +0000 (23:32 +0000)]

AAC Decoder: Use osi_free() to free buffers allocated by osi_malloc() am: 7a6fd5459e

Change-Id: I8fb43f7467aedd4e36237d7f355c8ed175e1e33c

commit | commitdiff | tree

Hansong Zhang [Tue, 11 Feb 2020 23:15:22 +0000 (15:15 -0800)]

AAC Decoder: Use osi_free() to free buffers allocated by osi_malloc()

* buffers allocated by osi_malloc() have canary bytes around it and need special method
osi_free() to free them

Bug: 148107188
Test: manual
Change-Id: Ifcfe494737c47e33755297214d3f637852a8be0b
(cherry picked from commit b88f8057fd28ca271ccd436a17f6489d4cf46697)

commit | commitdiff | tree

Jakub Pawlowski [Thu, 23 Jan 2020 13:32:56 +0000 (14:32 +0100)]

Make sure only valid packet fields are accessed in VendorPacketHandler

Move packet validation above first access to GetEvent()

Bug: 144066833
Test: avrcp_device_fuzz
Change-Id: I62c03763e7e921adc3456c53090fbf30ff87946e
(cherry picked from commit cd32e0d7cc0712c35f1652a9180f32be6b1cade8)

commit | commitdiff | tree

Jack He [Tue, 28 Jan 2020 03:33:45 +0000 (19:33 -0800)]

L2CAP socket: Stop L2CAP server by ID instead of PSM

* There could be multiple L2CAP socket control blocks with the same PSM
* The unique identifier for a L2CAP socket control block should be the
  unique ID allocated during control block initialization
* Use this ID to track L2CAP socket control block instead of PSM ensure
  that we close the correct socket
* Reset GAP handle and L2CAP socket ID to 0 when calling
  bta_jv_free_l2c_cb() so that disconnected L2CAP control blocks does
  not count

Test: CtsVerifier
Bug: 147997447
Bug: 144148429
Change-Id: Ideb428bc73aa0b36b8deb20fac280e44c8fe7db1
(cherry picked from commit ad23e6b2f473829b1819918cd3f927d1134c83b3)

commit | commitdiff | tree

Jack He [Tue, 28 Jan 2020 01:09:17 +0000 (17:09 -0800)]

L2CAP Socket: Keep track of last allocated socket ID

* Keep track of last allocated socket ID in L2CAP socket stack
* Use last_sock_id + 1 as new IDs when allocating new socket blocks
* The de-dupe and overflow detection mechanism in btsock_l2cap_alloc_l()
would handle the uint32_t overflow and duplicate ID cases

Test: CtsBluetoothTestCases
Bug: 144148429
Change-Id: Ieb9791ffa34eef919a32e4aff6f4b514859c69c0
(cherry picked from commit 79eda3270bbd23814b5ec73ee3fd96ac80222db8)

commit | commitdiff | tree

Jack He [Fri, 17 Jan 2020 00:20:06 +0000 (16:20 -0800)]

LE-COC: Free LE-COC server resource when BluetoothServerSocket is closed

* When BluetoothServerSocket is closed in the Java layer, the native
  layer should respond by freeing all resources used by the server
  including file descriptors, structs, PSMs, and security IDs
* We did this correctly for BR_EDR L2CAP COC channels after
  I4e37dcd858af258fbd64fbfb2fbf0083bd743e06, but the same fix did not
  apply to LE COC
* This CL make sure LE COC server resources are freed propertly upon
  server fd closure

Test: open and close LE COC server repeatedly on an Android phone
Fixes: 144148429
Change-Id: I16fa10e77612105d23848f71925ff6efc95bc75a
(cherry picked from commit d3c9966624530772fbdc469179726bd9191314c5)

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Dec 2019 18:45:07 +0000 (18:45 +0000)]

Merge "L2CAP: Check length for packet before connection complete" into qt-qpr1-dev

commit | commitdiff | tree

Mike Logan [Fri, 20 Dec 2019 18:35:38 +0000 (18:35 +0000)]

Merge "HCI: Check length of connection complete event" into qt-qpr1-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Dec 2019 18:08:56 +0000 (18:08 +0000)]

Merge "L2CAP: Bounds check num_handles in NumCompletedPackets" into qt-qpr1-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Dec 2019 18:07:53 +0000 (18:07 +0000)]

Merge "Fix potential OOB when parsing inquiry results" into qt-qpr1-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Dec 2019 18:04:52 +0000 (18:04 +0000)]

Merge "VSC batch scan: Check packet length" into qt-qpr1-dev

commit | commitdiff | tree

Hansong Zhang [Fri, 18 Oct 2019 20:14:23 +0000 (13:14 -0700)]

L2CAP: Check length for packet before connection complete

Bug: 141745011
Test: Run POC
Change-Id: I9dc27521fa2e7f6ea345ec65dc9d3e873d71ef0f

commit | commitdiff | tree

Hansong Zhang [Fri, 18 Oct 2019 20:36:43 +0000 (13:36 -0700)]

VSC batch scan: Check packet length

Bug: 142543524
Test: POC
Merged-In: I32633d5e6dfdd17b00d468cfd29ad081ae91f0e4
Change-Id: I32633d5e6dfdd17b00d468cfd29ad081ae91f0e4

commit | commitdiff | tree

Weichin Weng [Fri, 20 Dec 2019 08:38:01 +0000 (08:38 +0000)]

Merge changes from topic "NIAP_patch" into qt-qpr1-dev

* changes:
DO NOT MERGE: NIAP: Use AES-GCM 256 bits to encrypt key.
DO NOT MERGE: NIAP: Use keystore to encrypt KEY

commit | commitdiff | tree

Myles Watson [Thu, 10 Oct 2019 20:36:06 +0000 (13:36 -0700)]

L2CAP: Bounds check num_handles in NumCompletedPackets

Bug: 141617601
Test: Pair and connect
Change-Id: I1a8ff39f677c6957e99a4d3cbd278720dd273a83
(cherry picked from commit 2506db7d01939b286e34e404b80a73e6f4dc8593)

commit | commitdiff | tree

Myles Watson [Thu, 10 Oct 2019 21:19:33 +0000 (14:19 -0700)]

HCI: Check length of connection complete event

Fixes: 141619686
Test: Pair and connect
Change-Id: Ib15d6a8cbb8c6a7404bf1afa023277429029867d
(cherry picked from commit 7ee6458cf4939ad78dbebd70c2520ad56c31f4a9)

commit | commitdiff | tree

Jakub Pawlowski [Fri, 4 Oct 2019 14:40:41 +0000 (16:40 +0200)]

Fix potential OOB when parsing inquiry results

Bug: 141620271
Change-Id: I30c7558b1ae1a77d0004760ef831480347a06e11
(cherry picked from commit c44516749af81bc5fc79afc0772f42bf0ec37bd4)

commit | commitdiff | tree

TreeHugger Robot [Thu, 19 Dec 2019 16:47:01 +0000 (16:47 +0000)]

Merge "Handle BQR root inflammation event" into qt-qpr1-dev

commit | commitdiff | tree

Ugo Yu [Tue, 26 Nov 2019 09:18:32 +0000 (17:18 +0800)]

Handle BQR root inflammation event

* When Bluetooth process recieves BQR root inflammation event, wait
5 seconds for possible DEBUG_INFO events, then abort.
* Fix the DEBUG_INFO not working problem.
* Do not immediately abort when HAL service dies if abort_timer has
already started, so we won't interrupt log collecting procedure.

Bug: 145568772
Bug: 144572644
Bug: 144592765
Test: Manual
Change-Id: Ibe6c341a3e9aabec33de8d3f90c4a6a3403d06bc
Merged-In: Ibe6c341a3e9aabec33de8d3f90c4a6a3403d06bc

commit | commitdiff | tree

weichinweng [Mon, 16 Dec 2019 02:58:03 +0000 (10:58 +0800)]

DO NOT MERGE: NIAP: Use AES-GCM 256 bits to encrypt key.

use AES-GCM 256 bits to encrypt key.

Bug: 140483038
Test: NA
Change-Id: Ie5e85edf4fd8dbd9120ea383fd3b9214b6026816

commit | commitdiff | tree

weichinweng [Fri, 22 Nov 2019 03:57:08 +0000 (11:57 +0800)]

DO NOT MERGE: NIAP: Use keystore to encrypt KEY

Encrypt Classic and LE key via kerstore.

Bug: 140483038
Test: Manual
- Pair a device after OOBE
- adb shell settings put global niap_mode 1
- Re-enable Bluetooth
- Ensured that the Key was read correctly
- Ensured that the Key was encrypted when stored on disk

Change-Id: I6ece990135fb0a16eef3ecf6508ca759eee2c4c6

commit | commitdiff | tree

Automerger Merge Worker [Wed, 4 Dec 2019 08:59:26 +0000 (08:59 +0000)]

[automerger skipped] Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-mr1-dev am: 561bf0a604 -s ours am: ad6365c078 -s ours am: d0afd04b43 -s ours am: 81882c385d -s ours
am skip reason: Change-Id Iaca4db4ee9bf27362f62aba0da088727e98955d1 with SHA-1 291307f66c is in history

Change-Id: I0724d8046c8f5c53d5284a7fbf294acf25172d43

commit | commitdiff | tree

Automerger Merge Worker [Wed, 4 Dec 2019 08:59:14 +0000 (08:59 +0000)]

[automerger skipped] Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-dev am: 2039ca38e9 am: 5b85308108 am: 477e110c07 -s ours am: 45d039f2bc -s ours am: d8bf9a6516 -s ours am: 58a17c1e7f -s ours
am skip reason: Change-Id Iaca4db4ee9bf27362f62aba0da088727e98955d1 with SHA-1 291307f66c is in history

Change-Id: If8b5e513ee4e041254b6bde0a415f23c7167e955

commit | commitdiff | tree

Automerger Merge Worker [Wed, 4 Dec 2019 08:58:57 +0000 (08:58 +0000)]

[automerger skipped] Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into qt-dev am: 40a52c224f -s ours am: 818467c30d -s ours
am skip reason: Change-Id Iaca4db4ee9bf27362f62aba0da088727e98955d1 with SHA-1 140d8297ac is in history

Change-Id: If5e64421b909b65df488489c03023f5c5b89f7bf

commit | commitdiff | tree

Automerger Merge Worker [Wed, 4 Dec 2019 08:46:16 +0000 (08:46 +0000)]

[automerger skipped] Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-mr1-dev am: 561bf0a604 -s ours am: ad6365c078 -s ours am: d0afd04b43 -s ours
am skip reason: Change-Id Iaca4db4ee9bf27362f62aba0da088727e98955d1 with SHA-1 291307f66c is in history

Change-Id: I2d70a9464106f5b271c072a88f8717d6802955b0

commit | commitdiff | tree

Automerger Merge Worker [Wed, 4 Dec 2019 08:46:02 +0000 (08:46 +0000)]

[automerger skipped] Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-dev am: 2039ca38e9 am: 5b85308108 am: 477e110c07 -s ours am: 45d039f2bc -s ours am: d8bf9a6516 -s ours
am skip reason: Change-Id Iaca4db4ee9bf27362f62aba0da088727e98955d1 with SHA-1 291307f66c is in history

Change-Id: I60dc5b1a01024e46318fc710e265c28fa5efeeb8

commit | commitdiff | tree

Automerger Merge Worker [Wed, 4 Dec 2019 08:45:43 +0000 (08:45 +0000)]

[automerger skipped] Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into qt-dev am: 40a52c224f -s ours
am skip reason: Change-Id Iaca4db4ee9bf27362f62aba0da088727e98955d1 with SHA-1 140d8297ac is in history

Change-Id: I53f83d0fa0fd712160e2cba5957b8e8dd0204711

commit | commitdiff | tree

Automerger Merge Worker [Wed, 4 Dec 2019 08:39:59 +0000 (08:39 +0000)]

[automerger skipped] Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-mr1-dev am: 561bf0a604 -s ours am: ad6365c078 -s ours
am skip reason: Change-Id Iaca4db4ee9bf27362f62aba0da088727e98955d1 with SHA-1 291307f66c is in history

Change-Id: I872656ceacaa6387b21773a44ca2a55783dc4e37

commit | commitdiff | tree

Automerger Merge Worker [Wed, 4 Dec 2019 08:39:44 +0000 (08:39 +0000)]

[automerger skipped] Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-dev am: 2039ca38e9 am: 5b85308108 am: 477e110c07 -s ours am: 45d039f2bc -s ours
am skip reason: Change-Id Iaca4db4ee9bf27362f62aba0da088727e98955d1 with SHA-1 291307f66c is in history

Change-Id: I3a0c05b891878f12bb242007e589652e960a90e1

commit | commitdiff | tree

TreeHugger Robot [Wed, 4 Dec 2019 08:37:08 +0000 (08:37 +0000)]

Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into qt-dev

commit | commitdiff | tree

Automerger Merge Worker [Wed, 4 Dec 2019 08:31:45 +0000 (08:31 +0000)]

[automerger skipped] Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-mr1-dev am: 561bf0a604 -s ours
am skip reason: Change-Id Iaca4db4ee9bf27362f62aba0da088727e98955d1 with SHA-1 b4e8a17daa is in history

Change-Id: Iab0bb64fa4b03ea97330346476993a4812802264

commit | commitdiff | tree

Automerger Merge Worker [Wed, 4 Dec 2019 08:31:44 +0000 (08:31 +0000)]

[automerger skipped] Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into pi-dev am: 7f3b214ec9 am: 5f1bca6b9a am: 954bbdc172 -s ours
am skip reason: Change-Id Iaca4db4ee9bf27362f62aba0da088727e98955d1 with SHA-1 2aa92f871c is in history

Change-Id: I66dbc18fe8af551249eb493de070d5e64bb01bfd

commit | commitdiff | tree

Automerger Merge Worker [Wed, 4 Dec 2019 08:31:33 +0000 (08:31 +0000)]

[automerger skipped] Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-dev am: 2039ca38e9 am: 5b85308108 am: 477e110c07 -s ours
am skip reason: Change-Id Iaca4db4ee9bf27362f62aba0da088727e98955d1 with SHA-1 140d8297ac is in history

Change-Id: I818670e4df7c0d3b8d401fa8f6152aea39a412f1

commit | commitdiff | tree

TreeHugger Robot [Wed, 4 Dec 2019 08:29:41 +0000 (08:29 +0000)]

Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-mr1-dev

commit | commitdiff | tree

Automerger Merge Worker [Wed, 4 Dec 2019 08:22:12 +0000 (08:22 +0000)]

Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-dev am: 2039ca38e9 am: 5b85308108

Change-Id: I8c6f23a3cc7cfdb08242cbaa68ea62830ea49ccb

commit | commitdiff | tree

Automerger Merge Worker [Wed, 4 Dec 2019 08:19:54 +0000 (08:19 +0000)]

Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into pi-dev am: 7f3b214ec9 am: 5f1bca6b9a

Change-Id: I4a2fda2ab7b244ec584452400393ad0c3fe2e386

commit | commitdiff | tree

Automerger Merge Worker [Wed, 4 Dec 2019 08:13:37 +0000 (08:13 +0000)]

Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-dev am: 2039ca38e9

Change-Id: I0767ba267fc51a926930288752a1a079414d5a76

commit | commitdiff | tree

Automerger Merge Worker [Wed, 4 Dec 2019 08:09:17 +0000 (08:09 +0000)]

Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into pi-dev am: 7f3b214ec9

Change-Id: I965a027aa120a668c2474ce12520e8cf66856770

commit | commitdiff | tree

TreeHugger Robot [Wed, 4 Dec 2019 08:04:13 +0000 (08:04 +0000)]

Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 4 Dec 2019 07:49:36 +0000 (07:49 +0000)]

Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into pi-dev

commit | commitdiff | tree

Automerger Merge Worker [Wed, 4 Dec 2019 00:28:48 +0000 (00:28 +0000)]

Merge "SDP: add return after SDP disconnection" into oc-dev am: 765abc5cb6 am: 1f3bc32195 am: 52cd67a7de am: 6ef3486983 am: 7b3e597303 am: ed89932fdc

Change-Id: I11f172a9c5631fee04183a58f18176497ae56d73

commit | commitdiff | tree

Automerger Merge Worker [Wed, 4 Dec 2019 00:17:03 +0000 (00:17 +0000)]

Merge "SDP: add return after SDP disconnection" into oc-dev am: 765abc5cb6 am: 1f3bc32195 am: 52cd67a7de am: 6ef3486983 am: 7b3e597303

Change-Id: If737087dc356efde7f2f7c3cc844cbbe7e948e2f

commit | commitdiff | tree

Automerger Merge Worker [Tue, 3 Dec 2019 23:56:58 +0000 (23:56 +0000)]

Merge "SDP: add return after SDP disconnection" into oc-dev am: 765abc5cb6 am: 1f3bc32195 am: 52cd67a7de am: 6ef3486983

Change-Id: Idf52ecb11c7193b6711f87579fcc5a069025b1b3

commit | commitdiff | tree

Automerger Merge Worker [Tue, 3 Dec 2019 23:39:45 +0000 (23:39 +0000)]

Merge "SDP: add return after SDP disconnection" into oc-dev am: 765abc5cb6 am: 1f3bc32195 am: 52cd67a7de

Change-Id: I8aefeefb2a55d3548d47b10dab533bc7bff704f9

commit | commitdiff | tree

Automerger Merge Worker [Tue, 3 Dec 2019 23:29:41 +0000 (23:29 +0000)]

Merge "SDP: add return after SDP disconnection" into oc-dev am: 765abc5cb6 am: 1f3bc32195

Change-Id: I08a3792c2110c102e1a61051ff74bfa8ef8735c8

commit | commitdiff | tree

Automerger Merge Worker [Tue, 3 Dec 2019 23:21:52 +0000 (23:21 +0000)]

Merge "SDP: add return after SDP disconnection" into oc-dev am: 765abc5cb6

Change-Id: I4adccd7acc83181359c798527f6231a2b29e4429

commit | commitdiff | tree

TreeHugger Robot [Tue, 3 Dec 2019 23:03:51 +0000 (23:03 +0000)]

Merge "SDP: add return after SDP disconnection" into oc-dev

commit | commitdiff | tree

Automerger Merge Worker [Tue, 3 Dec 2019 01:31:32 +0000 (01:31 +0000)]

Merge "GAP: Correct the continuous pkt length in l2cap" into oc-dev am: 2a8a9b22f2 am: 5d8fde3e01 am: 5dbe08152a am: 294e64950c am: 28523075a6 am: dee808040c

Change-Id: I5fa64cfa93c5884b69a68dbcc9d117f71b1515a8

commit | commitdiff | tree

Automerger Merge Worker [Tue, 3 Dec 2019 01:20:25 +0000 (01:20 +0000)]

Merge "GAP: Correct the continuous pkt length in l2cap" into oc-dev am: 2a8a9b22f2 am: 5d8fde3e01 am: 5dbe08152a am: 294e64950c am: 28523075a6

Change-Id: If031a82d0c25708dfd2c99ba9db88bd5f014de0e

commit | commitdiff | tree

Automerger Merge Worker [Tue, 3 Dec 2019 01:06:32 +0000 (01:06 +0000)]

Merge "GAP: Correct the continuous pkt length in l2cap" into oc-dev am: 2a8a9b22f2 am: 5d8fde3e01 am: 5dbe08152a am: 294e64950c

Change-Id: I69396f7e01601ac6298b7a626268e96c1538dea0

commit | commitdiff | tree

Automerger Merge Worker [Tue, 3 Dec 2019 00:58:27 +0000 (00:58 +0000)]

Merge "GAP: Correct the continuous pkt length in l2cap" into oc-dev am: 2a8a9b22f2 am: 5d8fde3e01 am: 5dbe08152a

Change-Id: I9b78c5b36d9d1382f307fabacc20bb74d2e91322

commit | commitdiff | tree

Automerger Merge Worker [Tue, 3 Dec 2019 00:47:12 +0000 (00:47 +0000)]

Merge "GAP: Correct the continuous pkt length in l2cap" into oc-dev am: 2a8a9b22f2 am: 5d8fde3e01

Change-Id: I95231c695e0ec4a413c3cce64b3ea16936cc1bff

commit | commitdiff | tree

Automerger Merge Worker [Tue, 3 Dec 2019 00:40:09 +0000 (00:40 +0000)]

Merge "GAP: Correct the continuous pkt length in l2cap" into oc-dev am: 2a8a9b22f2

Change-Id: I9ed3a6586a87f199cef8b90d8c8c7d6bbb862823

commit | commitdiff | tree

TreeHugger Robot [Tue, 3 Dec 2019 00:33:29 +0000 (00:33 +0000)]

Merge "GAP: Correct the continuous pkt length in l2cap" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 29 Nov 2019 06:38:23 +0000 (06:38 +0000)]

Merge "Hearing Aid: Remove std::promise from suspend / resume calls, and stop audio ticks by no devices" into qt-qpr1-dev

commit | commitdiff | tree

Cheney Ni [Wed, 10 Jul 2019 08:24:31 +0000 (16:24 +0800)]

Hearing Aid: Remove std::promise from suspend / resume calls, and stop audio ticks by no devices

The Hearing Aid uses the stack main thread to be the media task thread.
This thread handles events / feeds audio data sequentially, and won't
have a race condition within the single thread. The promise is a bit
redundant, but wasted time to cause a potential deadlock that the caller
waits for the task thread finished which needed the caller's resource.

This CL also stops the audio ticks when no devices available, and no
need to wait for next timer expired. Besides, move all timer controls
into the media task thread, so timer is started / stopped at the same
thread, too.

Bug: 134996542
Test: add big delay within functions, and check no abnormal manually
Change-Id: If0b279a191d86b30db41a682dc7f0ad9470cb10e
Merged-In: If0b279a191d86b30db41a682dc7f0ad9470cb10e
(cherry picked from commit 90ba872a726b4b66c0b6af29e602dfee65edb710)

commit | commitdiff | tree