OSDN Git Service
Andre Eisenbach [Tue, 10 May 2016 15:40:21 +0000 (15:40 +0000)]
DO NOT MERGE Blacklist devices for absolute volume control am:
8fe9b6c9f7 am:
ef43e49660 -s ours am:
95a2c10363 -s ours
am:
4c2d25d1a1
* commit '
4c2d25d1a132f8391b5268fe3bcd40096736b7a6':
DO NOT MERGE Blacklist devices for absolute volume control
Change-Id: Ib77058733802e4103a48901502dd3582b813fd9d
Sharvil Nanavati [Tue, 10 May 2016 15:40:20 +0000 (15:40 +0000)]
DO NOT MERGE ANYWHERE Sync filesystem after saving a backup of the config file. am:
b51ad9de6a -s ours am:
fbe8c67b7d -s ours
am:
10be3e51ac -s ours
* commit '
10be3e51ac037cd167d7a28f0883dde64c3a7406':
DO NOT MERGE ANYWHERE Sync filesystem after saving a backup of the config file.
Change-Id: I5c5bf3549cf10cf08579a0003fff90c67c87ed03
Ajay Panicker [Tue, 10 May 2016 15:40:19 +0000 (15:40 +0000)]
DO NOT MERGE ANYWHERE Create backup for bt_config.conf am:
4d5f21452e -s ours am:
033c59192c -s ours
am:
7e52eeede7 -s ours
* commit '
7e52eeede7d171053047b802ad4404178643b30e':
DO NOT MERGE ANYWHERE Create backup for bt_config.conf
Change-Id: I423ad00c917bcbb502891670d17f2ef80423732e
Andre Eisenbach [Tue, 10 May 2016 15:40:18 +0000 (15:40 +0000)]
Merge "DO NOT MERGE Add ability to add interop entries dynamically (2/2)" into mnc-dr-dev am:
bd48fd98ad am:
9c32e564df am:
1c3f2f19e6 -s ours
am:
a72dc32ec8
* commit '
a72dc32ec8381be813857d7b8f40dd1cecd857ca':
DO NOT MERGE Add ability to add interop entries dynamically (2/2)
Change-Id: I1edb92eb273f25a7615bd749516eda88e9564d42
Andre Eisenbach [Tue, 10 May 2016 15:40:17 +0000 (15:40 +0000)]
DO NOT MERGE Remove Porsche car-kit pairing workaround am:
ed01581886 am:
0befe2bd60 am:
f87612c768 am:
67cbb3f146 -s ours
am:
03525d90d0
* commit '
03525d90d07308474c9e67514e02924128234ee7':
DO NOT MERGE Remove Porsche car-kit pairing workaround
Change-Id: I6063928a3e80a1fe15c5bbfd1613bb09943561d0
Jacky Cheung [Tue, 10 May 2016 15:40:16 +0000 (15:40 +0000)]
DO NOT MERGE ANYWHERE Update to use the new log tag for HCI timeout. am:
3bdb1d48d0 -s ours am:
9784748d28 -s ours
am:
1fc58f22b5 -s ours
* commit '
1fc58f22b591cfcc5f1ced99184dfade9f3c822a':
DO NOT MERGE ANYWHERE Update to use the new log tag for HCI timeout.
Change-Id: Ic19e2c8a807a7b4122fd26b0a18d99c044bf5b9e
Sharvil Nanavati [Tue, 10 May 2016 15:40:14 +0000 (15:40 +0000)]
DO NOT MERGE ANYWHERE Fix build break caused by duplicate log tag. am:
8dc3dfc2e7 -s ours am:
1e93a64272 -s ours
am:
42a6b5f5a2 -s ours
* commit '
42a6b5f5a222a03dc3cec12e6691c4ef429f2e6e':
DO NOT MERGE ANYWHERE Fix build break caused by duplicate log tag.
Change-Id: Iab19b3a13b537252f6b8e6de6eaeaf0a321d8102
Jacky Cheung [Tue, 10 May 2016 15:40:13 +0000 (15:40 +0000)]
DO NOT MERGE ANYWHERE Add BT_HCI_TIMEOUT log event to track HCI timeouts. am:
5a362a2f14 -s ours am:
3ecd1121d1 -s ours
am:
6e7a5f00d0 -s ours
* commit '
6e7a5f00d045155709525032851d6aef42f822c0':
DO NOT MERGE ANYWHERE Add BT_HCI_TIMEOUT log event to track HCI timeouts.
Change-Id: I6626a382e3a7d84ec085eba76048c29ab53305f7
Sharvil Nanavati [Tue, 10 May 2016 15:40:11 +0000 (15:40 +0000)]
Merge "Assume input from /dev/stdin if no argument provided to btsnooz.py." into cw-e-dev am:
853ca86427 -s ours am:
a3ed438701
am:
db4e9beabd
* commit '
db4e9beabd694f5ba78c5108579d42a975653611':
Assume input from /dev/stdin if no argument provided to btsnooz.py.
Change-Id: I279a85b021e048a1224c5e27c68c7733116e9f2b
Victor Tasayco Loarte [Tue, 10 May 2016 15:40:09 +0000 (15:40 +0000)]
DO NOT MERGE ANYWHERE implement wakelocks on bt adapter init am:
ef1f356866 -s ours am:
86ccba4678 -s ours
am:
4e9764fdf4 -s ours
* commit '
4e9764fdf4630a218d153c2ccda539bca01a625f':
DO NOT MERGE ANYWHERE implement wakelocks on bt adapter init
Change-Id: Iecb32534a22dc3589b8281ca68c232e25ebca11c
Sharvil Nanavati [Tue, 10 May 2016 15:40:07 +0000 (15:40 +0000)]
DO NOT MERGE ANYWHERE Spoof response to AT+CNUM if we don\'t get a reply from the audio gateway. am:
529a69c8e8 -s ours am:
9073d039b1 -s ours
am:
ea0dc3c653 -s ours
* commit '
ea0dc3c6539ae83876926e938b4f3d65df16d204':
DO NOT MERGE ANYWHERE Spoof response to AT+CNUM if we don't get a reply from the audio gateway.
Change-Id: I9ee263f33ee80545439185012dfa348c587f9843
Sharvil Nanavati [Tue, 10 May 2016 15:40:05 +0000 (15:40 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix return value for HAL function config_clear." into cw-e-dev am:
f1f9523db0 -s ours am:
87912b8170 -s ours
am:
10d34bedf6 -s ours
* commit '
10d34bedf663856b48931da58e7ff5a131d7af39':
DO NOT MERGE ANYWHERE Fix return value for HAL function config_clear.
Change-Id: I216326ea183b3a7b41e62bc108a432d9eef45cf6
Sharvil Nanavati [Tue, 10 May 2016 15:40:02 +0000 (15:40 +0000)]
Merge "DO NOT MERGE ANYWHERE Update GKI_freebuf to gracefully handle NULL." into cw-e-dev am:
e3aabcbbf5 -s ours am:
9844f6c5dd -s ours
am:
7dbccaa5c7 -s ours
* commit '
7dbccaa5c789aeb5d92d0109f0bd78387846273a':
DO NOT MERGE ANYWHERE Update GKI_freebuf to gracefully handle NULL.
Change-Id: I2c1ef1aaed53edb83236cbd07f8848884d59280b
Andre Eisenbach [Tue, 10 May 2016 15:40:00 +0000 (15:40 +0000)]
Merge "Additional headsets blacklisted for absolute volume" into mnc-dr1.5-dev am:
8c0745ad21 -s ours
am:
b5e366d111
* commit '
b5e366d111beef15fd13455286c40aae7f105ab0':
Additional headsets blacklisted for absolute volume
Change-Id: I3faa2b1f2da7ca9a7c0736254114511fdd5ce6ec
Andre Eisenbach [Tue, 10 May 2016 15:37:38 +0000 (15:37 +0000)]
DO NOT MERGE Blacklist devices for absolute volume control am:
8fe9b6c9f7 am:
ef43e49660 -s ours
am:
95a2c10363 -s ours
* commit '
95a2c10363cb93d1572cfb32df990f2fcf2163d6':
DO NOT MERGE Blacklist devices for absolute volume control
Change-Id: Ifa7be865da2a007843520781fea59d43a0bc77d7
Sharvil Nanavati [Tue, 10 May 2016 15:37:38 +0000 (15:37 +0000)]
DO NOT MERGE ANYWHERE Sync filesystem after saving a backup of the config file. am:
b51ad9de6a -s ours
am:
fbe8c67b7d -s ours
* commit '
fbe8c67b7d576433edfdc73422b2360281dd49e8':
DO NOT MERGE ANYWHERE Sync filesystem after saving a backup of the config file.
Change-Id: Iaa96e0146923ebd79b2a00854e33467c4d857657
Ajay Panicker [Tue, 10 May 2016 15:37:37 +0000 (15:37 +0000)]
DO NOT MERGE ANYWHERE Create backup for bt_config.conf am:
4d5f21452e -s ours
am:
033c59192c -s ours
* commit '
033c59192c6ab35daacb0da35819ffeb92f30ae9':
DO NOT MERGE ANYWHERE Create backup for bt_config.conf
Change-Id: I48a7bdbc3808eb8edfbba66662606820bb1d8e7c
Andre Eisenbach [Tue, 10 May 2016 15:37:36 +0000 (15:37 +0000)]
Merge "DO NOT MERGE Add ability to add interop entries dynamically (2/2)" into mnc-dr-dev am:
bd48fd98ad am:
9c32e564df
am:
1c3f2f19e6 -s ours
* commit '
1c3f2f19e616ea34978521d5eafaf1f387b2acef':
DO NOT MERGE Add ability to add interop entries dynamically (2/2)
Change-Id: Ie85400020a1c270f9629363a437a264730a27a84
Andre Eisenbach [Tue, 10 May 2016 15:37:36 +0000 (15:37 +0000)]
DO NOT MERGE Remove Porsche car-kit pairing workaround am:
ed01581886 am:
0befe2bd60 am:
f87612c768
am:
67cbb3f146 -s ours
* commit '
67cbb3f1468aa29ba1a605cf8540a8ed2f0ede8b':
DO NOT MERGE Remove Porsche car-kit pairing workaround
Change-Id: If6ad12cadb4a4869b439fb2fcb5e88df32d00111
Jacky Cheung [Tue, 10 May 2016 15:37:35 +0000 (15:37 +0000)]
DO NOT MERGE ANYWHERE Update to use the new log tag for HCI timeout. am:
3bdb1d48d0 -s ours
am:
9784748d28 -s ours
* commit '
9784748d287e66e8442d642794d2a181ba79031d':
DO NOT MERGE ANYWHERE Update to use the new log tag for HCI timeout.
Change-Id: I86410cc4cd914ba8620d29af063b90545d89a88b
Sharvil Nanavati [Tue, 10 May 2016 15:37:34 +0000 (15:37 +0000)]
DO NOT MERGE ANYWHERE Fix build break caused by duplicate log tag. am:
8dc3dfc2e7 -s ours
am:
1e93a64272 -s ours
* commit '
1e93a642725a5411af0bc0bbf95b6712ef05fbed':
DO NOT MERGE ANYWHERE Fix build break caused by duplicate log tag.
Change-Id: I4ac25f2d4014d8e14aa5a2872add31f075d2cdde
Jacky Cheung [Tue, 10 May 2016 15:37:33 +0000 (15:37 +0000)]
DO NOT MERGE ANYWHERE Add BT_HCI_TIMEOUT log event to track HCI timeouts. am:
5a362a2f14 -s ours
am:
3ecd1121d1 -s ours
* commit '
3ecd1121d131141070b7395bb849af29d01c18db':
DO NOT MERGE ANYWHERE Add BT_HCI_TIMEOUT log event to track HCI timeouts.
Change-Id: I9f6f5c11dc0cb14b383c644bf56db63e8b2877b6
Sharvil Nanavati [Tue, 10 May 2016 15:37:32 +0000 (15:37 +0000)]
Merge "Assume input from /dev/stdin if no argument provided to btsnooz.py." into cw-e-dev am:
853ca86427 -s ours
am:
a3ed438701
* commit '
a3ed4387016bb116659bba081fc1636b8c732e7b':
Assume input from /dev/stdin if no argument provided to btsnooz.py.
Change-Id: Ic33b785f042a9d3176f6d5a2873245372f651996
Victor Tasayco Loarte [Tue, 10 May 2016 15:37:31 +0000 (15:37 +0000)]
DO NOT MERGE ANYWHERE implement wakelocks on bt adapter init am:
ef1f356866 -s ours
am:
86ccba4678 -s ours
* commit '
86ccba46786e7caa5a20fbc926f0328d4019e7a2':
DO NOT MERGE ANYWHERE implement wakelocks on bt adapter init
Change-Id: Ie45199e22bec6920bcd012f9d07c6d5d43a25197
Sharvil Nanavati [Tue, 10 May 2016 15:37:30 +0000 (15:37 +0000)]
DO NOT MERGE ANYWHERE Spoof response to AT+CNUM if we don\'t get a reply from the audio gateway. am:
529a69c8e8 -s ours
am:
9073d039b1 -s ours
* commit '
9073d039b1ac633231e0ab8a2c707bfc5beb3c6c':
DO NOT MERGE ANYWHERE Spoof response to AT+CNUM if we don't get a reply from the audio gateway.
Change-Id: Id80d31bce15408cd7e5d7ec85973e260ce4da4aa
Sharvil Nanavati [Tue, 10 May 2016 15:37:30 +0000 (15:37 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix return value for HAL function config_clear." into cw-e-dev am:
f1f9523db0 -s ours
am:
87912b8170 -s ours
* commit '
87912b817087d085f5f449b86f8657a06d0ded05':
DO NOT MERGE ANYWHERE Fix return value for HAL function config_clear.
Change-Id: I562fb07e9505f682936c57e879bbd3c823a144bc
Sharvil Nanavati [Tue, 10 May 2016 15:37:28 +0000 (15:37 +0000)]
Merge "DO NOT MERGE ANYWHERE Update GKI_freebuf to gracefully handle NULL." into cw-e-dev am:
e3aabcbbf5 -s ours
am:
9844f6c5dd -s ours
* commit '
9844f6c5dd8f29ad927e30506a0ff3f18623c210':
DO NOT MERGE ANYWHERE Update GKI_freebuf to gracefully handle NULL.
Change-Id: I1897d810347ea6899678ded06262344d403334b9
tturney [Tue, 10 May 2016 15:37:17 +0000 (15:37 +0000)]
Merge "Additional headsets blacklisted for absolute volume" into mnc-dr1.5-dev
am:
8c0745ad21 -s ours
* commit '
8c0745ad219588a5c4322cde8e0c1f99eda7959e':
Additional headsets blacklisted for absolute volume
Change-Id: I4ac0d3b86274d617eff2ff1eaa09ccde3b63cb2f
Nitin Arora [Tue, 10 May 2016 15:30:41 +0000 (15:30 +0000)]
PTS: Read SMP pairing options from bt_stack.conf am:
2aa2b80259
am:
7fee66ff7a
* commit '
7fee66ff7aca7aa6a490b0bbd7fb9539884990c9':
PTS: Read SMP pairing options from bt_stack.conf
Change-Id: Ide2c58b47981b21fe0e4fc4623fcd79a9d9ae1da
Nitin Arora [Tue, 10 May 2016 15:30:41 +0000 (15:30 +0000)]
PTS: Avoid BR SDP after LE pairing am:
4cdb0e547b
am:
635fe90a47
* commit '
635fe90a47e2a58c8bb6c46e291f5910bf4c9426':
PTS: Avoid BR SDP after LE pairing
Change-Id: If209bf5ab417e6e08098346cc2d459bfc7088006
Nitin Arora [Tue, 10 May 2016 15:30:40 +0000 (15:30 +0000)]
PTS: Allow disabling connection updates am:
36ad41b678
am:
584f30c760
* commit '
584f30c7601bbdf36919f4ec0af77b0fbfd7d757':
PTS: Allow disabling connection updates
Change-Id: I3e97c887a90b714767b9bb94a558cc44299c5801
Nitin Arora [Tue, 10 May 2016 15:30:40 +0000 (15:30 +0000)]
PTS: Add a Secure Only mode. am:
a0ee0f8968
am:
8bd116393a
* commit '
8bd116393aa951141c31260c7f56e7374e2f0a15':
PTS: Add a Secure Only mode.
Change-Id: I09f3f0bd0f3161ed3d49f56a9c083b4cfcd82b4b
Nitin Arora [Tue, 10 May 2016 15:30:39 +0000 (15:30 +0000)]
Changes to allow LE key upgrade am:
6ea4d23280
am:
c1b4899258
* commit '
c1b489925822019b34c707df75d1ed2018d97b20':
Changes to allow LE key upgrade
Change-Id: I471914d2fa7a21422e88aa08b42ed7538c4c064c
Nitin Arora [Tue, 10 May 2016 15:16:51 +0000 (15:16 +0000)]
PTS: Read SMP pairing options from bt_stack.conf
am:
2aa2b80259
* commit '
2aa2b80259612d1a324891c2e036a7bb002b2462':
PTS: Read SMP pairing options from bt_stack.conf
Change-Id: Ic9a9c40284da55ff2389f5a987afaf8528867bfb
Nitin Arora [Tue, 10 May 2016 15:16:49 +0000 (15:16 +0000)]
PTS: Avoid BR SDP after LE pairing
am:
4cdb0e547b
* commit '
4cdb0e547b0dd056e60cc4724efa10c07e45fb96':
PTS: Avoid BR SDP after LE pairing
Change-Id: I98b651ab3b94a8c9a71a892d4919e249da0b1bcf
Nitin Arora [Tue, 10 May 2016 15:16:48 +0000 (15:16 +0000)]
PTS: Allow disabling connection updates
am:
36ad41b678
* commit '
36ad41b67822fed38597556eb102418ecf623c21':
PTS: Allow disabling connection updates
Change-Id: I42444ce90406c09f0aed17a9032c357238022ecf
Nitin Arora [Tue, 10 May 2016 15:16:47 +0000 (15:16 +0000)]
PTS: Add a Secure Only mode.
am:
a0ee0f8968
* commit '
a0ee0f896808a0d78cbaa30afc432cee5cf4d658':
PTS: Add a Secure Only mode.
Change-Id: Ib440967673774e098255d55f96dd40740aab27ce
Nitin Arora [Tue, 10 May 2016 15:16:45 +0000 (15:16 +0000)]
Changes to allow LE key upgrade
am:
6ea4d23280
* commit '
6ea4d232808d04f476b60aa2dcfc935ad4f8398e':
Changes to allow LE key upgrade
Change-Id: Id3e99c6a5fea64432917da824fc8282565de9384
Sharvil Nanavati [Tue, 10 May 2016 15:16:44 +0000 (15:16 +0000)]
Remove unused definition BOARD_HAVE_BLUETOOTH_BCM. am:
ad46ee235f am:
cdecc6b300 -s ours
am:
adebb96cf0
* commit '
adebb96cf0d683ffd074887f3e9270c4fa32304b':
Remove unused definition BOARD_HAVE_BLUETOOTH_BCM.
Change-Id: I03c6dee5822cb462748076be1e9718d1d6c8136c
Sharvil Nanavati [Tue, 10 May 2016 15:10:02 +0000 (15:10 +0000)]
Remove unused definition BOARD_HAVE_BLUETOOTH_BCM. am:
ad46ee235f
am:
cdecc6b300 -s ours
* commit '
cdecc6b300c5498fd90938e5b74271ae8e1e7b63':
Remove unused definition BOARD_HAVE_BLUETOOTH_BCM.
Change-Id: I8f5d835553c27bd04bb0eebae78e193b8c4bcacb
Nitin Arora [Sat, 12 Mar 2016 00:37:51 +0000 (16:37 -0800)]
PTS: Read SMP pairing options from bt_stack.conf
Use Case:
A number of cenrtification test cases require the host
to change the pairing options including auth request,
I/O capabilities, key distribution mask, key length
and Out of band capability.
Test Case: TP/PKE/BV-02-C
Failure:
Host currently only supports fixed SMP options and only
a few test cases involving pairing, are executed due
to that limitation.
Fix:
Added changes to read the SMP options from the bt_stack.conf
file at run time.
The pairing options are entered as a comma separated list eg:
SMPOptions=0xD,0x4,0xf,0xf,0x10
where the included hex values are in the following order:
\#auth, io, ikey, rkey, ksize
If all 5 options are not present, the host falls back to the
default values
Bug:
27852645
Change-Id: I693b05966695cf4660c5da10249c5f7c0663e53a
Nitin Arora [Fri, 11 Mar 2016 02:27:24 +0000 (18:27 -0800)]
PTS: Avoid BR SDP after LE pairing
Use Case: Certification test case requiring LE secure pairing
with PTS.
Test Case: TP/SCJW/BV-01-C
Failure:
While pairing with PTS for certification test cases, LE secure
pairing followed by BR/EDR cross key derivation results in the
host initiating the SDP to gather the remote BR/EDR services.
PTS considers it as a test failure.
Fix: Added run time flag in bt_stack.conf file
"PTS_DisableSDPOnLEPair" to disable the SDP immidiately after
LE pairing followed by cross key derivation.
Bug:
27852645
Change-Id: Ib5a05c47b99c2ef8256967a608ae9ebbdfba60ee
Nitin Arora [Thu, 11 Jun 2015 00:10:57 +0000 (17:10 -0700)]
PTS: Allow disabling connection updates
Use Case: Certification test case requiring LE secure pairing
with PTS.
Failure:
LE pairing test cases follow the host behavior where
connection parameters are switched to fast parameters
for SMP and service discovery and switched back to the
default values after SMP/LE discovery is complete.
PTS disconnects to these series of connection updates.
Fix:
This change disables connection updates based on run time
flag "PTS_DisableConnUpdates" fetched from bt_stack.conf
Bug:
27852645
Change-Id: I1da213fd143ccfcb0ac82c7049a94094d2716ff1
Nitin Arora [Fri, 11 Mar 2016 20:26:51 +0000 (12:26 -0800)]
PTS: Add a Secure Only mode.
Use Case:
Certification test cases require BLE to be in secure only
mode and reject legacy pairing requests.
Test Case: TP/SEC/SEM/BV-28-C
Failure:
Currently the host doesn't have a method of putting host into
a mode where it can only perform secure pairing.
This prevents execution of certification test cases
requiring Secure Only mode.
Fix:
Made changes to read the value of a tag "PTS_SecurePairOnly"
at runtime from the file "bt_stack.conf".
Bug:
27852645
Change-Id: I32cd6412621efeed2cb31c760a031762d9f369f9
Nitin Arora [Tue, 30 Jun 2015 22:04:23 +0000 (15:04 -0700)]
Changes to allow LE key upgrade
Use Case: Certifiation test cases require the LE key upgrade
to happen when the current MITM level of the device has
been upgraded. In that case, a repairing is performed,
leading to more authenticated LTK.
Test Case: TP/SEC/AUT/BV-17-C
Steps:
1. Perform LE pairing between two devices using no MITM.
2. Change the IO capability of the devices, so that a
repair would involve authentication.
3. Reconnect the devices and expect key upgrade.
Failure:
No key upgrade is seen at reconnection and the devices
continue to use the old key.
Fix:
Added changes to re-calulate the requirement of key
upgrade when the LE channel is already encrypted.
Bug:
27852645
Change-Id: If62f334dcf298b2ce9840e95035b4398cb951c84
Ajay Panicker [Mon, 9 May 2016 22:52:09 +0000 (22:52 +0000)]
Fix undefined usage of snprintf
am:
bd194901db
* commit '
bd194901dbbd2abebfe2510a1e97bb8d3a75102b':
Fix undefined usage of snprintf
Change-Id: I5451ab644db46ab7f10d485b26093fb162c31c99
Ajay Panicker [Thu, 5 May 2016 21:51:34 +0000 (14:51 -0700)]
Fix undefined usage of snprintf
Using a buffer as both the format and output for snprintf could
cause undefinied behaviour on certain platforms. Instead just
use a temporary variable.
Bug:
27882028
Change-Id: If9f96fba4b3447b3248917ab9fb994bd80cbca0f
Ajay Panicker [Mon, 9 May 2016 18:32:31 +0000 (18:32 +0000)]
Fix undefined usage of snprintf am:
def4219f08
am:
8a6756900c
* commit '
8a6756900cc3f7a0196a3600db01e78da5c976c4':
Fix undefined usage of snprintf
Change-Id: If9a0460f7e2131e516d9dfb5189c1c23b43f70c5
Ajay Panicker [Mon, 9 May 2016 18:26:59 +0000 (18:26 +0000)]
Fix undefined usage of snprintf
am:
def4219f08
* commit '
def4219f08f34fd5d930b1b98cfd8e3f29b3fc86':
Fix undefined usage of snprintf
Change-Id: I66b0939e09d2d32f4fbae8cdea6c8a8847d547cc
Pavlin Radoslavov [Mon, 9 May 2016 18:00:20 +0000 (18:00 +0000)]
Update l2c_fcr_clone_buf() to allocate large enough buffer
am:
d5ebb89744
* commit '
d5ebb89744974ec1ac867838d1a005ebf97be9b2':
Update l2c_fcr_clone_buf() to allocate large enough buffer
Change-Id: Ibc92f64e4b2b015bb7855aa58a397f71eaf8efc7
Ajay Panicker [Mon, 9 May 2016 17:39:08 +0000 (17:39 +0000)]
Remove redefine of ARRAY_SIZE am:
778d57b7e8
am:
97a807540e
* commit '
97a807540e804d7091df33283331b83d3beadc48':
Remove redefine of ARRAY_SIZE
Change-Id: I8da21aa24c634e508cf7d97c6098f220f770c0be
Ajay Panicker [Mon, 9 May 2016 17:34:30 +0000 (17:34 +0000)]
Remove redefine of ARRAY_SIZE
am:
778d57b7e8
* commit '
778d57b7e8222fff731d7deabed25983d508dc14':
Remove redefine of ARRAY_SIZE
Change-Id: I1ab8580f2cc7d8cf51cf1b7a93733e3b8ec079ef
Pavlin Radoslavov [Mon, 9 May 2016 17:34:25 +0000 (17:34 +0000)]
Update l2c_fcr_clone_buf() to allocate large enough buffer am:
871e9ba306
am:
f17a3ea95d
* commit '
f17a3ea95db2bba77816fa8ac9cc4d4490b4fafa':
Update l2c_fcr_clone_buf() to allocate large enough buffer
Change-Id: Icc97d71640383c26fcf647b235b2159f54197986
Ajay Panicker [Thu, 5 May 2016 21:51:34 +0000 (14:51 -0700)]
Fix undefined usage of snprintf
Using a buffer as both the format and output for snprintf could
cause undefinied behaviour on certain platforms. Instead just
use a temporary variable.
Bug:
27882028
Change-Id: If9f96fba4b3447b3248917ab9fb994bd80cbca0f
Pavlin Radoslavov [Mon, 9 May 2016 17:30:19 +0000 (17:30 +0000)]
Update l2c_fcr_clone_buf() to allocate large enough buffer
am:
871e9ba306
* commit '
871e9ba3063530a81ca7ff03e8433c25e1e8c096':
Update l2c_fcr_clone_buf() to allocate large enough buffer
Change-Id: Id80eba1a1bd5fba4b9fa525b05fe59ec0e4be61e
Ajay Panicker [Fri, 6 May 2016 21:01:24 +0000 (14:01 -0700)]
Remove redefine of ARRAY_SIZE
Bug:
28621069
Change-Id: Ie3db0ff733052113493d0e53bb35e2d617c31bff
Pavlin Radoslavov [Mon, 9 May 2016 02:12:53 +0000 (19:12 -0700)]
Update l2c_fcr_clone_buf() to allocate large enough buffer
Apparently, in some parts of the code we assumed the original
buffer size is large enough and we can extend it and write
few more octets at the end.
Bug:
28351270
Change-Id: Idc53d8f68e55808c9f6bf7f18568288304a9bfb9
Pavlin Radoslavov [Mon, 9 May 2016 02:12:53 +0000 (19:12 -0700)]
Update l2c_fcr_clone_buf() to allocate large enough buffer
Apparently, in some parts of the code we assumed the original
buffer size is large enough and we can extend it and write
few more octets at the end.
Bug:
28351270
Change-Id: Idc53d8f68e55808c9f6bf7f18568288304a9bfb9
Jakub Pawlowski [Mon, 9 May 2016 16:09:40 +0000 (16:09 +0000)]
Lower unnecesary high log level am:
292a62d370
am:
ca04fbcc49
* commit '
ca04fbcc49157aa1d273925475cdb58be39fc592':
Lower unnecesary high log level
Change-Id: Ic901ebf1f80ed76138169a28c0780684b4aaa7de
Jakub Pawlowski [Mon, 9 May 2016 16:05:50 +0000 (16:05 +0000)]
Lower unnecesary high log level
am:
292a62d370
* commit '
292a62d3708900ba83c1789dc2c06d6dfdb0cfac':
Lower unnecesary high log level
Change-Id: I83f1bb9d6797c5cc67bd37746498f221d7933bfb
Jakub Pawlowski [Fri, 6 May 2016 20:26:45 +0000 (13:26 -0700)]
Lower unnecesary high log level
Change-Id: Id4d255d79c844cd8dbf044e5bda073b8f5d784e7
Pavlin Radoslavov [Fri, 6 May 2016 04:46:32 +0000 (04:46 +0000)]
Merge "Call BTA_VendorCleanup() during actual cleanup of the stack" into nyc-dev
am:
641d33861c
* commit '
641d33861c1845f11593b3e8494f18f2fa64c185':
Call BTA_VendorCleanup() during actual cleanup of the stack
Change-Id: I3360f3da76d92644efde522a3c53f7b7a2529c9c
TreeHugger Robot [Fri, 6 May 2016 04:38:53 +0000 (04:38 +0000)]
Merge "Call BTA_VendorCleanup() during actual cleanup of the stack" into nyc-dev
Ajay Panicker [Fri, 6 May 2016 03:02:50 +0000 (03:02 +0000)]
Fix size of SDP black list array
am:
b790227413
* commit '
b79022741353c2c4438147b4cd75578e96ba06bb':
Fix size of SDP black list array
Change-Id: If5c166c50ebabddbf0dbbdcc803bcdf709ee2fa5
Ajay Panicker [Thu, 5 May 2016 19:51:49 +0000 (12:51 -0700)]
Fix size of SDP black list array
Bug:
28617843
Change-Id: Iff5690e3aae42d9907ed9351f1059461985c8a20
Pavlin Radoslavov [Fri, 6 May 2016 01:28:38 +0000 (01:28 +0000)]
Call BTA_VendorCleanup() during actual cleanup of the stack am:
58318f48fc
am:
3837ec0e70
* commit '
3837ec0e70485ed20c77b426bd00ce0a4ea5232a':
Call BTA_VendorCleanup() during actual cleanup of the stack
Change-Id: I800acdec672875a841df6043ce46ce02e8716a0a
Pavlin Radoslavov [Fri, 6 May 2016 01:24:02 +0000 (01:24 +0000)]
Call BTA_VendorCleanup() during actual cleanup of the stack
am:
58318f48fc
* commit '
58318f48fc93afe606c77f3ef83c7bff83b65bf8':
Call BTA_VendorCleanup() during actual cleanup of the stack
Change-Id: Ib3ba5aea125cc08676cbe3bbea8eac7e0ca90085
Andy Hung [Fri, 6 May 2016 00:26:37 +0000 (00:26 +0000)]
Match socket buffer sizes between audio HAL and BT server
am:
e97d975cce
* commit '
e97d975cce213b8c6e4f69bc3fc75411a1743647':
Match socket buffer sizes between audio HAL and BT server
Change-Id: Ibe4880ca23bd825c2ba24b157ca7907b3a68acc8
Pavlin Radoslavov [Thu, 5 May 2016 23:20:15 +0000 (16:20 -0700)]
Call BTA_VendorCleanup() during actual cleanup of the stack
Previously, BTA_VendorCleanup() was called during the shutdown
process, and this created race condition crashing the stack.
Bug:
28450506
Change-Id: Ibee90d406036862b95d18e2ef00b08b820c70f68
Pavlin Radoslavov [Thu, 5 May 2016 23:20:15 +0000 (16:20 -0700)]
Call BTA_VendorCleanup() during actual cleanup of the stack
Previously, BTA_VendorCleanup() was called during the shutdown
process, and this created race condition crashing the stack.
Bug:
28450506
Change-Id: Ibee90d406036862b95d18e2ef00b08b820c70f68
Andy Hung [Wed, 4 May 2016 22:47:05 +0000 (15:47 -0700)]
Match socket buffer sizes between audio HAL and BT server
Adjust our mixer buffer size to be one quarter that of
the socket buffer size for quadruple buffering.
Increase socket buffer size from 20*512 to 28*512 to
smooth out variability in data draw from AudioFlinger.
Bug:
28286313
Change-Id: I8a9ca9e1f4639a0724cfe126acc670c2058cb0fb
Andre Eisenbach [Thu, 5 May 2016 23:49:11 +0000 (23:49 +0000)]
Merge "Return handle if an RFCOMM port is already open" am:
6787eb8288
am:
e4a857c401
* commit '
e4a857c40109745c021d897d94eb66578502dc76':
Return handle if an RFCOMM port is already open
Change-Id: I88117f92b58385d4119181dfab3528bcfcc059fc
Andre Eisenbach [Thu, 5 May 2016 23:44:37 +0000 (23:44 +0000)]
Merge "Return handle if an RFCOMM port is already open"
am:
6787eb8288
* commit '
6787eb828800e0a0999db3c947e54818bbc1c101':
Return handle if an RFCOMM port is already open
Change-Id: I41aedda07880ee8f25356b39dd1d818d7420498b
Treehugger Robot [Thu, 5 May 2016 23:29:24 +0000 (23:29 +0000)]
Merge "Return handle if an RFCOMM port is already open"
Ajay Panicker [Thu, 5 May 2016 22:45:48 +0000 (22:45 +0000)]
Merge "Fix size of SDP black list array" am:
f7432dc822
am:
fb9d71b246
* commit '
fb9d71b24648f489bf051052c6d757b1443a2845':
Fix size of SDP black list array
Change-Id: Ib0149940ab051e5f9aebf37b8a97f7a42a650a6b
Ajay Panicker [Thu, 5 May 2016 22:41:03 +0000 (22:41 +0000)]
Merge "Fix size of SDP black list array"
am:
f7432dc822
* commit '
f7432dc8225e7085dd194e7a5f99243c019e195b':
Fix size of SDP black list array
Change-Id: I34c18f6c51c2ac189ba456e603c4695f54644236
Treehugger Robot [Thu, 5 May 2016 22:31:40 +0000 (22:31 +0000)]
Merge "Fix size of SDP black list array"
Andre Eisenbach [Thu, 5 May 2016 17:57:44 +0000 (10:57 -0700)]
Return handle if an RFCOMM port is already open
By returning the handle, the upper layer (BTA) will attempt to
disconnect on failure to connect. Thus the attempt to open the port will
still fail, but any subsequent attempts will be able to recover.
Bug:
27204458
Change-Id: I0f8489b98adeb7f5e217201ffbbb35132a66f210
Andre Eisenbach [Thu, 5 May 2016 22:04:29 +0000 (22:04 +0000)]
Return handle if an RFCOMM port is already open
am:
cafe4ea4a9
* commit '
cafe4ea4a969431e3783d7e9dcb701cf8052abd2':
Return handle if an RFCOMM port is already open
Change-Id: I653dfb558822224f799d50780538df3697f48ab7
Myles Watson [Thu, 5 May 2016 21:09:38 +0000 (21:09 +0000)]
Allow C++ code to check bt_stack_config options am:
e8a76f58bc
am:
bb3924faff
* commit '
bb3924faff399ac537a928375fee12ae4fdb7708':
Allow C++ code to check bt_stack_config options
Change-Id: I53b682ea409a5d94add3bce88d3ef47af2a0c9f1
Myles Watson [Thu, 5 May 2016 21:04:57 +0000 (21:04 +0000)]
Allow C++ code to check bt_stack_config options
am:
e8a76f58bc
* commit '
e8a76f58bc176828f1824044eebe33bb0d55b0ce':
Allow C++ code to check bt_stack_config options
Change-Id: I50e07a19968183c523b0d2b5f09d2e11bde08a20
Andre Eisenbach [Thu, 5 May 2016 17:57:44 +0000 (10:57 -0700)]
Return handle if an RFCOMM port is already open
By returning the handle, the upper layer (BTA) will attempt to
disconnect on failure to connect. Thus the attempt to open the port will
still fail, but any subsequent attempts will be able to recover.
Bug:
27204458
Change-Id: I0f8489b98adeb7f5e217201ffbbb35132a66f210
Ajay Panicker [Thu, 5 May 2016 19:51:49 +0000 (12:51 -0700)]
Fix size of SDP black list array
Bug:
28617843
Change-Id: Iff5690e3aae42d9907ed9351f1059461985c8a20
Myles Watson [Thu, 5 May 2016 18:57:54 +0000 (11:57 -0700)]
Allow C++ code to check bt_stack_config options
Stack configuration options are parsed in C.
Bug:
28485365
Change-Id: I046ef5c676256a8da23bf8c0a7d1eeb1e9603c05
Pavlin Radoslavov [Thu, 5 May 2016 02:16:36 +0000 (02:16 +0000)]
Merge "Avoid NULL pointer usage of startup_future in case of HCI startup timeout" into nyc-dev
am:
1a3dc131a8
* commit '
1a3dc131a8fbac2db5bd7d7d8ace71d8087a5c12':
Avoid NULL pointer usage of startup_future in case of HCI startup timeout
Change-Id: Ifda524fb9d78cbd5be6d68bd828e6c07b8ed6792
TreeHugger Robot [Thu, 5 May 2016 02:09:02 +0000 (02:09 +0000)]
Merge "Avoid NULL pointer usage of startup_future in case of HCI startup timeout" into nyc-dev
Pavlin Radoslavov [Thu, 5 May 2016 01:09:51 +0000 (01:09 +0000)]
Fixed test_periodic_unregister_processing_queue unit test
am:
bafbe828a5
* commit '
bafbe828a56b7a8654b09c5612c8a0021ea5a864':
Fixed test_periodic_unregister_processing_queue unit test
Change-Id: Ia00eb74cebf2ad6a4c4c6a8584e2663a69b15d4c
Pavlin Radoslavov [Wed, 4 May 2016 23:46:11 +0000 (23:46 +0000)]
Fixed test_periodic_unregister_processing_queue unit test am:
f5d575c418
am:
e0e278a79c
* commit '
e0e278a79cf87a5c36d952fc2819e9ab84b4c8b7':
Fixed test_periodic_unregister_processing_queue unit test
Change-Id: I5faefa0a709a566f546ccfcb79cead3678539dea
Pavlin Radoslavov [Wed, 4 May 2016 23:46:11 +0000 (23:46 +0000)]
Avoid NULL pointer usage of startup_future in case of HCI startup timeout am:
3d1aa9d385
am:
4be77d1921
* commit '
4be77d192139fd85c95f3f16acbb6cad0c689739':
Avoid NULL pointer usage of startup_future in case of HCI startup timeout
Change-Id: I07f8c22f00977ade1f1917796148a97703deccee
Pavlin Radoslavov [Wed, 4 May 2016 23:44:17 +0000 (23:44 +0000)]
Fixed test_periodic_unregister_processing_queue unit test
am:
f5d575c418
* commit '
f5d575c4183dae210876ff0f27a54747367b6a19':
Fixed test_periodic_unregister_processing_queue unit test
Change-Id: I9add4ca7c14f0c03f22e33ad057fe47eb587d849
Pavlin Radoslavov [Wed, 4 May 2016 23:44:16 +0000 (23:44 +0000)]
Avoid NULL pointer usage of startup_future in case of HCI startup timeout
am:
3d1aa9d385
* commit '
3d1aa9d3856342764db13503a07452a79edbaeda':
Avoid NULL pointer usage of startup_future in case of HCI startup timeout
Change-Id: Id2c6442e547ed77ef685f9d0c37137d4d45c0e6c
Pavlin Radoslavov [Wed, 4 May 2016 06:00:15 +0000 (23:00 -0700)]
Fixed test_periodic_unregister_processing_queue unit test
Removed a copy-and-paste check in the
test_periodic_unregister_processing_queue unit test.
The removed check adds little value - it has time-dependency,
and is not robust.
Bug:
26982349
Change-Id: I4adb948713b9946b5eb821d6fe52b7ada1400182
Pavlin Radoslavov [Wed, 4 May 2016 06:00:15 +0000 (23:00 -0700)]
Fixed test_periodic_unregister_processing_queue unit test
Removed a copy-and-paste check in the
test_periodic_unregister_processing_queue unit test.
The removed check adds little value - it has time-dependency,
and is not robust.
Bug:
26982349
Change-Id: I4adb948713b9946b5eb821d6fe52b7ada1400182
Pavlin Radoslavov [Wed, 4 May 2016 03:20:06 +0000 (20:20 -0700)]
Avoid NULL pointer usage of startup_future in case of HCI startup timeout
Previously, the startup_timer was created within the HCI layer start_up()
function, and after several vendor calls, we created the startup_future
that is used elsewhere. However, if any of the vendor calls blocks for
very long time, the startup_timer will timeout.
The startup_timer_expired() callback will try to use startup_future
that is still NULL, and that will trigger an assert.
The issue is avoided by creating the startup_future right before
the startup_timer is scheduled.
Bug:
28528815
Change-Id: Ib9f2c6581a86d3df0fd4d02d0b4c290663b5cfa1
Pavlin Radoslavov [Wed, 4 May 2016 03:20:06 +0000 (20:20 -0700)]
Avoid NULL pointer usage of startup_future in case of HCI startup timeout
Previously, the startup_timer was created within the HCI layer start_up()
function, and after several vendor calls, we created the startup_future
that is used elsewhere. However, if any of the vendor calls blocks for
very long time, the startup_timer will timeout.
The startup_timer_expired() callback will try to use startup_future
that is still NULL, and that will trigger an assert.
The issue is avoided by creating the startup_future right before
the startup_timer is scheduled.
Bug:
28528815
Change-Id: Ib9f2c6581a86d3df0fd4d02d0b4c290663b5cfa1
Pavlin Radoslavov [Wed, 4 May 2016 02:09:02 +0000 (02:09 +0000)]
Update alarm_unregister_processing_queue() to cancel scheduled alarms
am:
1db7f1b0a7
* commit '
1db7f1b0a7d235977ac81623ab06c51df8b493de':
Update alarm_unregister_processing_queue() to cancel scheduled alarms
Change-Id: I473741a00a0efcf2d68bd4c11ded58a5dc1f056b
Pavlin Radoslavov [Wed, 4 May 2016 00:14:51 +0000 (00:14 +0000)]
Merge "Update alarm_unregister_processing_queue() to cancel scheduled alarms" am:
757b1b48d7
am:
818d4e9bdf
* commit '
818d4e9bdf2a1af9bf7806da466cd1a8c98875c2':
Update alarm_unregister_processing_queue() to cancel scheduled alarms
Change-Id: I1a2a783e01be44d81175c3615fbf1b4dabab6bd9
Pavlin Radoslavov [Mon, 2 May 2016 17:52:07 +0000 (10:52 -0700)]
Update alarm_unregister_processing_queue() to cancel scheduled alarms
Update the alarm_unregister_processing_queue() implementation
so it cancels all alarms that are scheduled on the corresponding
queue.
This fixes a race condition during Bluetooth shutdown: if an alarm
expires right after an alarm processing queue is invalidated,
the alarm processing would try to use the invalidated queue.
Added the corresponding unit tests.
Also, added a missing call to alarm_unregister_processing_queue().
Bug:
26982349
Change-Id: I09a111e8080b6dbc354dffa03a487f7a8c578ce6
Pavlin Radoslavov [Wed, 4 May 2016 00:05:52 +0000 (00:05 +0000)]
Merge "Update alarm_unregister_processing_queue() to cancel scheduled alarms"
am:
757b1b48d7
* commit '
757b1b48d72a917443a6eb48dba45075d0e546c9':
Update alarm_unregister_processing_queue() to cancel scheduled alarms
Change-Id: Ifb404ace4b6b24d673f3f67e0270f37f40eddf49
Treehugger Robot [Tue, 3 May 2016 23:57:18 +0000 (23:57 +0000)]
Merge "Update alarm_unregister_processing_queue() to cancel scheduled alarms"