OSDN Git Service

android-x86/system-bt.git
7 years agoRevert "Added unit test for async_manager with sockets" am: 10986700c3 am: d8179f363a...
Myles Watson [Thu, 18 Aug 2016 16:38:05 +0000 (16:38 +0000)]
Revert "Added unit test for async_manager with sockets" am: 10986700c3 am: d8179f363a am: 73f71a5b83
am: 2b571b8fd5

Change-Id: I2a8c80762da0196aac5d551a66329494e4d1bcf5

7 years agoRevert "Added unit test for async_manager with sockets" am: 10986700c3 am: d8179f363a
Myles Watson [Thu, 18 Aug 2016 16:34:52 +0000 (16:34 +0000)]
Revert "Added unit test for async_manager with sockets" am: 10986700c3 am: d8179f363a
am: 73f71a5b83

Change-Id: Ibc8c627cc0127fcd52df22e6c98a9a61654ab144

7 years agoRevert "Added unit test for async_manager with sockets" am: 10986700c3
Myles Watson [Thu, 18 Aug 2016 16:31:52 +0000 (16:31 +0000)]
Revert "Added unit test for async_manager with sockets" am: 10986700c3
am: d8179f363a

Change-Id: Ie04d5905706bf428e99a083b974cf97383f34bb6

7 years agoRevert "Added unit test for async_manager with sockets"
Myles Watson [Thu, 18 Aug 2016 16:28:54 +0000 (16:28 +0000)]
Revert "Added unit test for async_manager with sockets"
am: 10986700c3

Change-Id: I3b8264f5b4124dda166cafdce61ac0c941e18710

7 years agoRevert "Added unit test for async_manager with sockets"
Myles Watson [Thu, 18 Aug 2016 16:22:01 +0000 (16:22 +0000)]
Revert "Added unit test for async_manager with sockets"

This reverts commit 1387d4330da52034af67d1dbc61b870e8f89c820.

Change-Id: I4af4e0d5ac5a108f3de44d186db97592a70c729e

7 years agoAdded unit test for async_manager with sockets am: 1387d4330d am: 8021195db5 am:...
Jorge E. Moreira [Thu, 18 Aug 2016 15:46:18 +0000 (15:46 +0000)]
Added unit test for async_manager with sockets am: 1387d4330d am: 8021195db5 am: 1ab705f78e
am: 509a99a6d0

Change-Id: I67d592188407aefc11964ecdaf459fe9e60ef0b1

7 years agoAdded unit test for async_manager with sockets am: 1387d4330d am: 8021195db5
Jorge E. Moreira [Thu, 18 Aug 2016 15:43:18 +0000 (15:43 +0000)]
Added unit test for async_manager with sockets am: 1387d4330d am: 8021195db5
am: 1ab705f78e

Change-Id: I99314b4dfa2d36e113e05309b0b59d73368aca93

7 years agoAdded unit test for async_manager with sockets am: 1387d4330d
Jorge E. Moreira [Thu, 18 Aug 2016 15:40:18 +0000 (15:40 +0000)]
Added unit test for async_manager with sockets am: 1387d4330d
am: 8021195db5

Change-Id: Ie3fc649eb845d07a46e10b256244bc909c4f9220

7 years agoAdded unit test for async_manager with sockets
Jorge E. Moreira [Thu, 18 Aug 2016 15:37:51 +0000 (15:37 +0000)]
Added unit test for async_manager with sockets
am: 1387d4330d

Change-Id: I4ccdc7e14b81e2bdc7862764b49f4d2dd4044d04

7 years agoAdded unit test for async_manager with sockets
Jorge E. Moreira [Wed, 17 Aug 2016 20:53:00 +0000 (13:53 -0700)]
Added unit test for async_manager with sockets

Change-Id: I8d31f766722e4b4a6c6fe00e30a957ac43176cf1

7 years agoFix clang-tidy warnings in bt. am: 5dc0d15e78 am: 1c47f8e5b4 am: d50820533f
Chih-Hung Hsieh [Thu, 18 Aug 2016 02:05:52 +0000 (02:05 +0000)]
Fix clang-tidy warnings in bt. am: 5dc0d15e78 am: 1c47f8e5b4 am: d50820533f
am: eb962419d6

Change-Id: I676425ff07f8f015e158ead2ee6c9c735e0a1438

7 years agoFix clang-tidy warnings in bt. am: 5dc0d15e78 am: 1c47f8e5b4
Chih-Hung Hsieh [Thu, 18 Aug 2016 02:02:58 +0000 (02:02 +0000)]
Fix clang-tidy warnings in bt. am: 5dc0d15e78 am: 1c47f8e5b4
am: d50820533f

Change-Id: I89ebc60adf956d67e32a298670563b6b5b96cef3

7 years agoFix clang-tidy warnings in bt. am: 5dc0d15e78
Chih-Hung Hsieh [Thu, 18 Aug 2016 01:59:58 +0000 (01:59 +0000)]
Fix clang-tidy warnings in bt. am: 5dc0d15e78
am: 1c47f8e5b4

Change-Id: I49d1bd55af0be71253c1f451c15639c4cf43d4d6

7 years agoFix clang-tidy warnings in bt.
Chih-Hung Hsieh [Thu, 18 Aug 2016 01:57:01 +0000 (01:57 +0000)]
Fix clang-tidy warnings in bt.
am: 5dc0d15e78

Change-Id: I217b7399aa9294ca3fe47bc862aebe83343037c0

7 years agoFix incorrect fd used for select() call in vendor lib async_manager am: 7225e499e8...
Jorge E. Moreira [Thu, 18 Aug 2016 00:51:16 +0000 (00:51 +0000)]
Fix incorrect fd used for select() call in vendor lib async_manager am: 7225e499e8 am: af070f1141 am: 9befe1dba4
am: 081e1b6f7e

Change-Id: Id2ca565448adeae69df639e046d255614d22eac9

7 years agoFix clang-tidy warnings in bt.
Chih-Hung Hsieh [Wed, 17 Aug 2016 21:12:51 +0000 (14:12 -0700)]
Fix clang-tidy warnings in bt.

* Add explicit keyword to conversion constructors,
  or add NOLINT to implicit conversion constructors.
Bug: 28341362
* Use const reference type for read-only parameters,
  or add NOLINT to keep same callback function signature.
Bug: 30407689
* Use const reference type for loop index variables to avoid unnecessary copy.
Bug: 30413223
* Use const reference type to avoid unnecessary copy.
Bug: 30413862
Test: build with WITH_TIDY=1

Change-Id: I8237d332f32d7be09ab72a8de82160fdb776dcd1

7 years agoFix incorrect fd used for select() call in vendor lib async_manager am: 7225e499e8...
Jorge E. Moreira [Thu, 18 Aug 2016 00:18:13 +0000 (00:18 +0000)]
Fix incorrect fd used for select() call in vendor lib async_manager am: 7225e499e8 am: af070f1141
am: 9befe1dba4

Change-Id: I282f530b28fc3e6b8e6317d56dbe2ace78fa0527

7 years agoFix incorrect fd used for select() call in vendor lib async_manager am: 7225e499e8
Jorge E. Moreira [Thu, 18 Aug 2016 00:15:12 +0000 (00:15 +0000)]
Fix incorrect fd used for select() call in vendor lib async_manager am: 7225e499e8
am: af070f1141

Change-Id: Id56d05a6d64895786cd1fd54409bc195249172d0

7 years agoFix incorrect fd used for select() call in vendor lib async_manager
Jorge E. Moreira [Thu, 18 Aug 2016 00:12:14 +0000 (00:12 +0000)]
Fix incorrect fd used for select() call in vendor lib async_manager
am: 7225e499e8

Change-Id: Icfc520b04919ab57b7a7a3b36435e05842a62f39

7 years agoFix incorrect fd used for select() call in vendor lib async_manager
Jorge E. Moreira [Wed, 17 Aug 2016 20:59:15 +0000 (13:59 -0700)]
Fix incorrect fd used for select() call in vendor lib async_manager

Change-Id: Iabb8389ee6fcef0f9c6a17838d6a3a9a517befc6

7 years agoMake gatt_attr use opportunistic connection am: 109891d07f am: 135e7d693b am: 604d9e48d8
Jakub Pawlowski [Wed, 17 Aug 2016 16:21:17 +0000 (16:21 +0000)]
Make gatt_attr use opportunistic connection am: 109891d07f am: 135e7d693b am: 604d9e48d8
am: 612fb4d6e7

Change-Id: I92d70571cd8e549b9184f101a528c0683e1e1551

7 years agoMake gatt_attr use opportunistic connection am: 109891d07f am: 135e7d693b
Jakub Pawlowski [Wed, 17 Aug 2016 16:17:47 +0000 (16:17 +0000)]
Make gatt_attr use opportunistic connection am: 109891d07f am: 135e7d693b
am: 604d9e48d8

Change-Id: Ic01aa894ffef2ae06ff2b91322825c4b3350f757

7 years agoMake gatt_attr use opportunistic connection am: 109891d07f
Jakub Pawlowski [Wed, 17 Aug 2016 16:15:47 +0000 (16:15 +0000)]
Make gatt_attr use opportunistic connection am: 109891d07f
am: 135e7d693b

Change-Id: I63407418dcb55451c8eeb8d1534b8fb42a21d5cb

7 years agoMake gatt_attr use opportunistic connection
Jakub Pawlowski [Wed, 17 Aug 2016 16:11:50 +0000 (16:11 +0000)]
Make gatt_attr use opportunistic connection
am: 109891d07f

Change-Id: I432143bb5149619e2ec223b84e03f3280f1182c1

7 years agoMake gatt_attr use opportunistic connection
Jakub Pawlowski [Mon, 18 Jul 2016 16:06:49 +0000 (09:06 -0700)]
Make gatt_attr use opportunistic connection

This patch creates new connection mode - opportunistic connection. When
such connection is made, no call to gatt_update_app_hold_link_status
will be made when it's started.

This means that connecting and disconnecting in this mode won't trigger
disconnect timer. When other, app creates regular connection and then
disconnects, the physical connection might get disconnected.

Opportunistic connection is used only for code setting CCC right now.

Bug: 30186455
Change-Id: Ia5be7682b6c3dcb4993060f818dee603aef3e19e

7 years agoMerge "Synchronize the code with AOSP" into stage-aosp-master am: fd172619d1 am:...
Pavlin Radoslavov [Wed, 17 Aug 2016 04:30:04 +0000 (04:30 +0000)]
Merge "Synchronize the code with AOSP" into stage-aosp-master am: fd172619d1 am: 8ad8a54833
am: 6e671275af

Change-Id: I9c3ca1e79e76b092602f9dc73db690f54b1f55ba

7 years agoSynchronize the code with AOSP am: 5d712cfde6 am: 8dd79539ae
Pavlin Radoslavov [Wed, 17 Aug 2016 04:30:02 +0000 (04:30 +0000)]
Synchronize the code with AOSP am: 5d712cfde6 am: 8dd79539ae
am: f6b9c7c050

Change-Id: I90f4f045dc5af7fc5927fbf1c058cf1b89153d7c

7 years agoMerge "Synchronize the code with AOSP" into stage-aosp-master am: fd172619d1
Pavlin Radoslavov [Wed, 17 Aug 2016 04:21:33 +0000 (04:21 +0000)]
Merge "Synchronize the code with AOSP" into stage-aosp-master am: fd172619d1
am: 8ad8a54833

Change-Id: Ic3369e861ae81863b1b7454be0705e8278742151

7 years agoSynchronize the code with AOSP am: 5d712cfde6
Pavlin Radoslavov [Wed, 17 Aug 2016 04:21:32 +0000 (04:21 +0000)]
Synchronize the code with AOSP am: 5d712cfde6
am: 8dd79539ae

Change-Id: Ibcedd89828ca63b9aaa8233226fa1ccd600f7f32

7 years agoMerge "Synchronize the code with AOSP" into stage-aosp-master
Pavlin Radoslavov [Wed, 17 Aug 2016 04:20:09 +0000 (04:20 +0000)]
Merge "Synchronize the code with AOSP" into stage-aosp-master
am: fd172619d1

Change-Id: Ib0b748006eb4a0f6f748a4d0807ac140efca4c11

7 years agoSynchronize the code with AOSP
Pavlin Radoslavov [Wed, 17 Aug 2016 04:20:08 +0000 (04:20 +0000)]
Synchronize the code with AOSP
am: 5d712cfde6

Change-Id: I47e0c1d5518c7bf799cd527abfc5bf20bfba9e7f

7 years agoMerge "Synchronize the code with AOSP" into nyc-mr1-dev-plus-aosp
Pavlin Radoslavov [Wed, 17 Aug 2016 04:16:43 +0000 (04:16 +0000)]
Merge "Synchronize the code with AOSP" into nyc-mr1-dev-plus-aosp
am: 146c3855ed

Change-Id: Ifdcf7217d25ecdb545cb5f18de3713529f4dce58

7 years agoSynchronize the code with AOSP
Pavlin Radoslavov [Wed, 17 Aug 2016 04:16:43 +0000 (04:16 +0000)]
Synchronize the code with AOSP
am: bf4ff7e2b9

Change-Id: Id547ef3df3e1492e74f234e53530578448628de8

7 years agoSynchronize the code with the internal tree am: 55f82cd30f am: 8f4fb98c7e am: db92f4d323
Pavlin Radoslavov [Wed, 17 Aug 2016 04:16:42 +0000 (04:16 +0000)]
Synchronize the code with the internal tree am: 55f82cd30f am: 8f4fb98c7e am: db92f4d323
am: 456991488b

Change-Id: I9041459bb8468061b74cf35000bdcbe2263ddd51

7 years agoRandomize allocation canary am: 4980fab05c am: 74132bf9f4
Marie Janssen [Wed, 17 Aug 2016 04:16:42 +0000 (04:16 +0000)]
Randomize allocation canary am: 4980fab05c am: 74132bf9f4
am: ec3cf88ad3

Change-Id: Id2b462a339bace2f3c76aa94e6eb8d0dab3115be

7 years agoMerge "Synchronize the code with AOSP" into stage-aosp-master
TreeHugger Robot [Wed, 17 Aug 2016 04:15:14 +0000 (04:15 +0000)]
Merge "Synchronize the code with AOSP" into stage-aosp-master

7 years agoMerge "Synchronize the code with AOSP" into nyc-mr1-dev-plus-aosp
TreeHugger Robot [Wed, 17 Aug 2016 04:15:14 +0000 (04:15 +0000)]
Merge "Synchronize the code with AOSP" into nyc-mr1-dev-plus-aosp

7 years agoMerge "Synchronize the code with AOSP"
TreeHugger Robot [Wed, 17 Aug 2016 04:15:14 +0000 (04:15 +0000)]
Merge "Synchronize the code with AOSP"

7 years agoSynchronize the code with the internal tree am: 55f82cd30f am: 8f4fb98c7e
Pavlin Radoslavov [Wed, 17 Aug 2016 04:10:31 +0000 (04:10 +0000)]
Synchronize the code with the internal tree am: 55f82cd30f am: 8f4fb98c7e
am: db92f4d323

Change-Id: I92c6f954eddbf7170483045ba67ae054302df14b

7 years agoSynchronize the code with the internal tree am: 55f82cd30f
Pavlin Radoslavov [Wed, 17 Aug 2016 04:09:09 +0000 (04:09 +0000)]
Synchronize the code with the internal tree am: 55f82cd30f
am: 8f4fb98c7e

Change-Id: Ida73caa1f443b8f5d32a49e884e8aa1623f7684d

7 years agoSynchronize the code with the internal tree
Pavlin Radoslavov [Wed, 17 Aug 2016 04:05:32 +0000 (04:05 +0000)]
Synchronize the code with the internal tree
am: 55f82cd30f

Change-Id: I0e7041e39efad3e51638091e1f9e9b24b8a4176c

7 years agoRandomize allocation canary am: 4980fab05c
Marie Janssen [Wed, 17 Aug 2016 03:57:04 +0000 (03:57 +0000)]
Randomize allocation canary am: 4980fab05c
am: 74132bf9f4

Change-Id: I58ba08ef437134260bde913354c5ed3aa0cc04a2

7 years agoRandomize allocation canary
Marie Janssen [Wed, 17 Aug 2016 03:54:00 +0000 (03:54 +0000)]
Randomize allocation canary
am: 4980fab05c

Change-Id: Id70d37e6c62b393b02bae32743e2acc20334341d

7 years agoRandomize allocation canary
Marie Janssen [Fri, 4 Mar 2016 01:50:26 +0000 (17:50 -0800)]
Randomize allocation canary

A static allocation canary can be susceptible to buffer overflow
exploit code bypassing, so this randomizes it on every run.

Bug: 27411268
Change-Id: I81b06f89951a012c08d846042653ec957f3e9127
(cherry picked from commit 7c054350fb7da9da1fdb86e7f7b9a801cf1c39e4)

7 years agoSynchronize the code with AOSP
Pavlin Radoslavov [Wed, 17 Aug 2016 02:52:49 +0000 (19:52 -0700)]
Synchronize the code with AOSP

Minor spacing fixes.

Change-Id: Id29171cea320265ede96520feb39fc8929bbaddc

7 years agoSynchronize the code with the internal tree
Pavlin Radoslavov [Wed, 17 Aug 2016 02:42:16 +0000 (19:42 -0700)]
Synchronize the code with the internal tree

Spacing, line split, etc.

Change-Id: I781e771e93b104bbc044d1646106c19d8af55e7b

7 years agoSynchronize the code with AOSP
Pavlin Radoslavov [Wed, 17 Aug 2016 02:37:58 +0000 (19:37 -0700)]
Synchronize the code with AOSP

Removed an extra empty line.

Change-Id: Id000a7e83c31ba08370b7eb3498e53d1f3931955

7 years agoSynchronize the code with AOSP
Pavlin Radoslavov [Wed, 17 Aug 2016 02:35:51 +0000 (19:35 -0700)]
Synchronize the code with AOSP

Minor edits - spacing, etc.

Change-Id: I172d64585e82c23789fbad17e7366bbc55a9e50d

7 years agoMerge "Removed bogus AVRC_ADV_CTRL_INCLUDED guard"
TreeHugger Robot [Wed, 17 Aug 2016 02:23:02 +0000 (02:23 +0000)]
Merge "Removed bogus AVRC_ADV_CTRL_INCLUDED guard"

7 years agoMerge "Fix a typo in pre-compiler error message" am: 7cc80100e1 am: 8461b92874 am...
Glenn Kasten [Wed, 17 Aug 2016 01:57:53 +0000 (01:57 +0000)]
Merge "Fix a typo in pre-compiler error message" am: 7cc80100e1 am: 8461b92874 am: f8e28f2339
am: f330a45d18

Change-Id: If0ebc0eda7a0b67e6e77502e467cc6b91c250db7

7 years agoMerge "Fix a typo in pre-compiler error message" am: 7cc80100e1 am: 8461b92874
Glenn Kasten [Wed, 17 Aug 2016 01:55:19 +0000 (01:55 +0000)]
Merge "Fix a typo in pre-compiler error message" am: 7cc80100e1 am: 8461b92874
am: f8e28f2339

Change-Id: I9bb7e7163097573e81d662afe9bc192044310649

7 years agoMerge "Fix a typo in pre-compiler error message" am: 7cc80100e1
Glenn Kasten [Wed, 17 Aug 2016 01:52:52 +0000 (01:52 +0000)]
Merge "Fix a typo in pre-compiler error message" am: 7cc80100e1
am: 8461b92874

Change-Id: Ib09fa2926b76be300f31f9144356742ca7106b03

7 years agoMerge "Fix a typo in pre-compiler error message"
Glenn Kasten [Wed, 17 Aug 2016 01:50:24 +0000 (01:50 +0000)]
Merge "Fix a typo in pre-compiler error message"
am: 7cc80100e1

Change-Id: Ieccd17672a872e3d60bb48cf1b3a34c8cbe09ae9

7 years agoMerge "Fix a typo in pre-compiler error message"
Treehugger Robot [Wed, 17 Aug 2016 01:44:34 +0000 (01:44 +0000)]
Merge "Fix a typo in pre-compiler error message"

7 years agoAdd Subaru and Nissan car kits to auto pair blacklist am: ed272ff2f7 am: 765dcf9c6f...
Andre Eisenbach [Wed, 17 Aug 2016 01:23:52 +0000 (01:23 +0000)]
Add Subaru and Nissan car kits to auto pair blacklist am: ed272ff2f7 am: 765dcf9c6f am: 70f6f3296e
am: 5d359ef8da

Change-Id: I9f97b7a1918b133ce36aa92270c8e1396a9a3e70

7 years agoAdd Subaru and Nissan car kits to auto pair blacklist am: ed272ff2f7 am: 765dcf9c6f
Andre Eisenbach [Wed, 17 Aug 2016 01:19:54 +0000 (01:19 +0000)]
Add Subaru and Nissan car kits to auto pair blacklist am: ed272ff2f7 am: 765dcf9c6f
am: 70f6f3296e

Change-Id: I05fe311f7ae3cae3896fa682c34ddde1aac11c5a

7 years agoAdd Subaru and Nissan car kits to auto pair blacklist am: ed272ff2f7
Andre Eisenbach [Wed, 17 Aug 2016 01:17:50 +0000 (01:17 +0000)]
Add Subaru and Nissan car kits to auto pair blacklist am: ed272ff2f7
am: 765dcf9c6f

Change-Id: I8a3996d03d97e9ee3658dde9b0ba170c4f2e78c1

7 years agoAdd Subaru and Nissan car kits to auto pair blacklist
Andre Eisenbach [Wed, 17 Aug 2016 01:14:22 +0000 (01:14 +0000)]
Add Subaru and Nissan car kits to auto pair blacklist
am: ed272ff2f7

Change-Id: I1b39608a553f5cef0748c9b6464fa92cc1eee823

7 years agoRemoved bogus AVRC_ADV_CTRL_INCLUDED guard
Pavlin Radoslavov [Wed, 17 Aug 2016 00:59:45 +0000 (17:59 -0700)]
Removed bogus AVRC_ADV_CTRL_INCLUDED guard

Removed bogus "#if (AVRC_ADV_CTRL_INCLUDED == TRUE)"
inside function AVRC_Ctrl_ParsResponse() for AVRC_OP_VENDOR opcode.
That guard has been removed by an earlier CL:
  https://android-review.googlesource.com/#/c/213887/
However, it keeps re-appearing because of the automerger.

Change-Id: Ib73eb1ef7c8245e423cbfbf3d6a0f765ac8ad9ab

7 years agoFix a typo in pre-compiler error message
Glenn Kasten [Tue, 8 Mar 2016 20:11:38 +0000 (12:11 -0800)]
Fix a typo in pre-compiler error message

Change-Id: Ia584c748ea065739e0f6df1ea8a86df517a257af

7 years agoDisable 3Mbps packets for AVDT ACL links am: f527ce28b4 -s ours am: d0ca1d1483 am...
Sathya Kumar [Wed, 17 Aug 2016 00:08:20 +0000 (00:08 +0000)]
Disable 3Mbps packets for AVDT ACL links am: f527ce28b4  -s ours am: d0ca1d1483 am: c989d41c7b
am: 7409a52f75

Change-Id: I9fbdb00b304750c1860db1cf31209b9df125224a

7 years agoDisable 3Mbps packets for AVDT ACL links am: f527ce28b4 -s ours am: d0ca1d1483
Sathya Kumar [Wed, 17 Aug 2016 00:04:48 +0000 (00:04 +0000)]
Disable 3Mbps packets for AVDT ACL links am: f527ce28b4  -s ours am: d0ca1d1483
am: c989d41c7b

Change-Id: I66fd74be8f5e2e8a74f25d9c942ae587ddf8a65e

7 years agoDisable 3Mbps packets for AVDT ACL links am: f527ce28b4 -s ours
Sathya Kumar [Wed, 17 Aug 2016 00:02:19 +0000 (00:02 +0000)]
Disable 3Mbps packets for AVDT ACL links am: f527ce28b4  -s ours
am: d0ca1d1483

Change-Id: Ic5b666d6d2ab236152a8c3b450b48fab5357a95f

7 years agoDisable 3Mbps packets for AVDT ACL links
Sathya Kumar [Tue, 16 Aug 2016 23:58:21 +0000 (23:58 +0000)]
Disable 3Mbps packets for AVDT ACL links
am: f527ce28b4  -s ours

Change-Id: I2b464cbf192b41edfd904ae4eddd7159a64213e7

7 years agoAdd Subaru and Nissan car kits to auto pair blacklist
Andre Eisenbach [Mon, 27 Jun 2016 22:49:53 +0000 (15:49 -0700)]
Add Subaru and Nissan car kits to auto pair blacklist

Bug: 29157087
Change-Id: If227963b939a9b0ed55e6d900364c71932d3cfe8
(cherry picked from commit d13870072e61e468e6cd8f3e007a1647f7001a14)

7 years agoresolve merge conflicts of 37119da to stage-aosp-master am: 61ee6c68a2 am: 218d3df09a
Sathya Kumar [Tue, 16 Aug 2016 22:43:13 +0000 (22:43 +0000)]
resolve merge conflicts of 37119da to stage-aosp-master am: 61ee6c68a2 am: 218d3df09a
am: 398e66e8c0

Change-Id: Iea6ebf94adbceda7a6e11d0fefbecd812604ce65

7 years agoresolve merge conflicts of 37119da to stage-aosp-master am: 61ee6c68a2
Sathya Kumar [Tue, 16 Aug 2016 22:39:44 +0000 (22:39 +0000)]
resolve merge conflicts of 37119da to stage-aosp-master am: 61ee6c68a2
am: 218d3df09a

Change-Id: I6e516cb2bcac807c917dc6a22ab13a81b229bb69

7 years agoresolve merge conflicts of 37119da to stage-aosp-master
Sathya Kumar [Tue, 16 Aug 2016 22:37:40 +0000 (22:37 +0000)]
resolve merge conflicts of 37119da to stage-aosp-master
am: 61ee6c68a2

Change-Id: Ic66f39df5e2e8d861b9e56354e0f526a2bcfe9d6

7 years agoDisable 3Mbps packets for AVDT ACL links
Sathya Kumar [Thu, 7 Jan 2016 23:26:05 +0000 (17:26 -0600)]
Disable 3Mbps packets for AVDT ACL links

Change-Id: I4b1b52ec8aeaf5eab0672231889e0ea6f23aa852
(cherry picked from commit 26bb30842b6c64821c2a6c4a515f290140017105)
Merged-In: I4b1b52ec8aeaf5eab0672231889e0ea6f23aa852

7 years agoresolve merge conflicts of 37119da to stage-aosp-master
Sathya Kumar [Thu, 7 Jan 2016 23:26:05 +0000 (17:26 -0600)]
resolve merge conflicts of 37119da to stage-aosp-master

Change-Id: I4b1b52ec8aeaf5eab0672231889e0ea6f23aa852
(cherry picked from commit 26bb30842b6c64821c2a6c4a515f290140017105)

7 years agoUse C++ style std::string instead of C-style string am: d97874240b am: f48fcc7628
Pavlin Radoslavov [Tue, 16 Aug 2016 21:07:38 +0000 (21:07 +0000)]
Use C++ style std::string instead of C-style string am: d97874240b am: f48fcc7628
am: e0833a770a

Change-Id: Ic1e3c50b4c9a949cba0e48c2e64fff4faf455003

7 years agoUse C++ style std::string instead of C-style string am: d97874240b
Pavlin Radoslavov [Tue, 16 Aug 2016 21:04:08 +0000 (21:04 +0000)]
Use C++ style std::string instead of C-style string am: d97874240b
am: f48fcc7628

Change-Id: I0dc74978bede1f36575438855cd0da344c68e733

7 years agoUse C++ style std::string instead of C-style string
Pavlin Radoslavov [Tue, 16 Aug 2016 21:02:34 +0000 (21:02 +0000)]
Use C++ style std::string instead of C-style string
am: d97874240b

Change-Id: Ied3b1fd784cdd40c8612282497f0f7a0dce47010

7 years agoUse C++ style std::string instead of C-style string
Pavlin Radoslavov [Tue, 16 Aug 2016 17:44:36 +0000 (10:44 -0700)]
Use C++ style std::string instead of C-style string

Change-Id: I323187bca7555adada2a8a5cf2c25e30592040b1

7 years agoMerge "Make default SBC bitrate configurable by device." am: 57e911ea25 am: a918f41b6...
Sridhar Vashist [Tue, 16 Aug 2016 10:33:26 +0000 (10:33 +0000)]
Merge "Make default SBC bitrate configurable by device." am: 57e911ea25 am: a918f41b60 am: 215705173a
am: 608f09bc06

Change-Id: Ic2c6b62a732ae32e635364e037d431acb251fbfc

7 years agoMerge "Make default SBC bitrate configurable by device." am: 57e911ea25 am: a918f41b60
Sridhar Vashist [Tue, 16 Aug 2016 10:29:26 +0000 (10:29 +0000)]
Merge "Make default SBC bitrate configurable by device." am: 57e911ea25 am: a918f41b60
am: 215705173a

Change-Id: I1264c273d0ec23fde2c5760eb9c2f08f12e7c94b

7 years agoMerge "Make default SBC bitrate configurable by device." am: 57e911ea25
Sridhar Vashist [Tue, 16 Aug 2016 10:25:30 +0000 (10:25 +0000)]
Merge "Make default SBC bitrate configurable by device." am: 57e911ea25
am: a918f41b60

Change-Id: I9ef79d797c5da8416d52232dbab28d62585c837c

7 years agoMerge "Make default SBC bitrate configurable by device."
Sridhar Vashist [Tue, 16 Aug 2016 10:21:38 +0000 (10:21 +0000)]
Merge "Make default SBC bitrate configurable by device."
am: 57e911ea25

Change-Id: I3233e531e724bb1fa27afc73bc78c5fdf3ad5117

7 years agoMerge "Make default SBC bitrate configurable by device."
Treehugger Robot [Tue, 16 Aug 2016 10:15:01 +0000 (10:15 +0000)]
Merge "Make default SBC bitrate configurable by device."

7 years agoMerge "Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE." am...
Sridhar Vashist [Tue, 16 Aug 2016 09:56:04 +0000 (09:56 +0000)]
Merge "Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE." am: 21a7e48c0f am: 0c1fffb857 am: f0b8a62c10
am: 15001a75b9

Change-Id: Ic797b5a2a7b7e1391168505c7ba47c37f3d8a62d

7 years agoMerge "Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE." am...
Sridhar Vashist [Tue, 16 Aug 2016 09:52:04 +0000 (09:52 +0000)]
Merge "Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE." am: 21a7e48c0f am: 0c1fffb857
am: f0b8a62c10

Change-Id: I2fbdfc806364cbd2c2fef85154922735cf106588

7 years agoMerge "Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE." am...
Sridhar Vashist [Tue, 16 Aug 2016 09:48:04 +0000 (09:48 +0000)]
Merge "Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE." am: 21a7e48c0f
am: 0c1fffb857

Change-Id: I18ea1e681745866caa8e9ea93111e088893e7a48

7 years agoMerge "Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE."
Sridhar Vashist [Tue, 16 Aug 2016 09:44:06 +0000 (09:44 +0000)]
Merge "Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE."
am: 21a7e48c0f

Change-Id: If6b31a75dfd04c69e620402e81df741c348f714c

7 years agoMerge "Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE."
Treehugger Robot [Tue, 16 Aug 2016 09:37:37 +0000 (09:37 +0000)]
Merge "Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE."

7 years agoMake default SBC bitrate configurable by device.
Sridhar Vashist [Wed, 14 Oct 2015 22:47:02 +0000 (17:47 -0500)]
Make default SBC bitrate configurable by device.

Configurable default SBC bitrate so that audio quality can be maintained
for sampling rates other than 44.1kHz

Change-Id: Ia4197c0a500088cfa48a8ba821e9738a16c3fc6e
Signed-off-by: Sridhar Vashist <svashist@motorola.com>
(cherry picked from commit 5f308397b7fe8a8da3f88b0f8910c3863ed1ec0b)

7 years agoMerge "GATT: Deregister notification when a GATT connection is closed" am: bb75465676...
ugo_yu [Tue, 16 Aug 2016 08:42:30 +0000 (08:42 +0000)]
Merge "GATT: Deregister notification when a GATT connection is closed" am: bb75465676 am: a430cc3b4e am: 527f48d729
am: 9a1d49530f

Change-Id: Iff68e7b246541f3fbd6c148dfec6fc2f3e955bb1

7 years agoMerge "GATT: Deregister notification when a GATT connection is closed" am: bb75465676...
ugo_yu [Tue, 16 Aug 2016 08:38:30 +0000 (08:38 +0000)]
Merge "GATT: Deregister notification when a GATT connection is closed" am: bb75465676 am: a430cc3b4e
am: 527f48d729

Change-Id: I766d4f2795da34b6ef6ba72bf1a7a014ba754b00

7 years agoMerge "GATT: Deregister notification when a GATT connection is closed" am: bb75465676
ugo_yu [Tue, 16 Aug 2016 08:34:29 +0000 (08:34 +0000)]
Merge "GATT: Deregister notification when a GATT connection is closed" am: bb75465676
am: a430cc3b4e

Change-Id: I265d1235811f23d40db916ca3c43f8eff8a44e6c

7 years agoMerge "GATT: Deregister notification when a GATT connection is closed"
ugo_yu [Tue, 16 Aug 2016 08:30:32 +0000 (08:30 +0000)]
Merge "GATT: Deregister notification when a GATT connection is closed"
am: bb75465676

Change-Id: Ia3bd8ef88282634a6d142593f9edb8ba41c65ac5

7 years agoMerge "GATT: Deregister notification when a GATT connection is closed"
Treehugger Robot [Tue, 16 Aug 2016 08:22:56 +0000 (08:22 +0000)]
Merge "GATT: Deregister notification when a GATT connection is closed"

7 years agoAlways send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE.
Sridhar Vashist [Fri, 7 Aug 2015 00:40:24 +0000 (19:40 -0500)]
Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE.

There appear to be race cases where the peer sends a START before
we reconfigure the stream. Avoid btif_av state from getting
mismatched by always sending out the SUSPEND_CFM during RECONFIGURE.

Change-Id: I2034cd111466f792233cedb60a3a0df11d055962
Signed-off-by: Sridhar Vashist <svashist@motorola.com>
(cherry picked from commit 8b1c7af03a2a8eedd1efd2eddca3ecd4b61bfd95)

7 years agoMerge "Check size of pin before replying" am: 545ac907dd am: e4047a70e5 am: 6cbf37a2e2
Marie Janssen [Tue, 16 Aug 2016 07:53:27 +0000 (07:53 +0000)]
Merge "Check size of pin before replying" am: 545ac907dd am: e4047a70e5 am: 6cbf37a2e2
am: fd88666910

Change-Id: Idf3551a983c3060c242850c2e5812b1bbee72024

7 years agoMerge "Check size of pin before replying" am: 545ac907dd am: e4047a70e5
Marie Janssen [Tue, 16 Aug 2016 07:49:27 +0000 (07:49 +0000)]
Merge "Check size of pin before replying" am: 545ac907dd am: e4047a70e5
am: 6cbf37a2e2

Change-Id: Ia1adba7a4c76ac49e3d7d0c9e598cf97cc594f83

7 years agoMerge "Check size of pin before replying" am: 545ac907dd
Marie Janssen [Tue, 16 Aug 2016 07:44:56 +0000 (07:44 +0000)]
Merge "Check size of pin before replying" am: 545ac907dd
am: e4047a70e5

Change-Id: I978c74e497ab8dc2b2927ed814ce8f6dddd3de29

7 years agoMerge "Check size of pin before replying"
Marie Janssen [Tue, 16 Aug 2016 07:40:58 +0000 (07:40 +0000)]
Merge "Check size of pin before replying"
am: 545ac907dd

Change-Id: Ibbf6e58b4297871899baa85b9bfa3510eac402b1

7 years agoaudio_a2dp_hw: Always update frame counter in out_write am: cd85170ab8 am: 8d3142f759...
Andy Hung [Tue, 16 Aug 2016 07:36:56 +0000 (07:36 +0000)]
audio_a2dp_hw: Always update frame counter in out_write am: cd85170ab8 am: 8d3142f759 am: 3992d3f29e
am: 81e610f5d8

Change-Id: I8d8421d39d22b629cdd6f9503b9ffaa45f6041c4

7 years agoMerge "Check size of pin before replying"
Treehugger Robot [Tue, 16 Aug 2016 07:35:18 +0000 (07:35 +0000)]
Merge "Check size of pin before replying"

7 years agoaudio_a2dp_hw: Always update frame counter in out_write am: cd85170ab8 am: 8d3142f759
Andy Hung [Tue, 16 Aug 2016 07:32:56 +0000 (07:32 +0000)]
audio_a2dp_hw: Always update frame counter in out_write am: cd85170ab8 am: 8d3142f759
am: 3992d3f29e

Change-Id: Ic48b03608190ab16bc3ec4ca91811f329ff1d36a

7 years agoaudio_a2dp_hw: Always update frame counter in out_write am: cd85170ab8
Andy Hung [Tue, 16 Aug 2016 07:28:56 +0000 (07:28 +0000)]
audio_a2dp_hw: Always update frame counter in out_write am: cd85170ab8
am: 8d3142f759

Change-Id: I6e0399b88f634c027d639b5ff3506feb94d391e3

7 years agoaudio_a2dp_hw: Always update frame counter in out_write
Andy Hung [Tue, 16 Aug 2016 07:24:56 +0000 (07:24 +0000)]
audio_a2dp_hw: Always update frame counter in out_write
am: cd85170ab8

Change-Id: Ic87913c0b7d8ed7d3d8dceb4a292517706e1724b