OSDN Git Service
Ajay Panicker [Fri, 22 Apr 2016 05:09:06 +0000 (22:09 -0700)]
Fix double definition
Change-Id: I40fea4e71db4dc8a1370298632aefd893955d0fe
(cherry picked from commit
33641bab5e5d6f1c4a91778faf7947492f7e6062)
Ajay Panicker [Fri, 22 Apr 2016 03:26:15 +0000 (03:26 +0000)]
Protect config module init and add date to config file
am:
995c7d63e1
* commit '
995c7d63e15923a1a8bdfb2456cc4086468e281c':
Protect config module init and add date to config file
Change-Id: I64e42928d3c73cd44b64f1b2276d95f5f8d26242
Ajay Panicker [Mon, 18 Apr 2016 18:31:48 +0000 (11:31 -0700)]
Protect config module init and add date to config file
Bug:
27354612
Change-Id: Ie956faddaa69101211e554722d682c18ed00a20a
Ajay Panicker [Fri, 22 Apr 2016 01:07:00 +0000 (01:07 +0000)]
A2DP task media alarm non-null protection am:
420dfac186 -s ours
am:
c73a90ddee
* commit '
c73a90ddee4849690847c2c509cfe9e7bd82afba':
A2DP task media alarm non-null protection
Change-Id: Iab565e697029e65423ac16e34fb2c1a28d69ee89
Ajay Panicker [Fri, 22 Apr 2016 01:04:41 +0000 (01:04 +0000)]
A2DP task media alarm non-null protection
am:
420dfac186 -s ours
* commit '
420dfac186a8510d970b076a2f067f32a4118a5e':
A2DP task media alarm non-null protection
Change-Id: I77ca8ccd909c397b0662724f30e478526b32cfb4
Sharvil Nanavati [Fri, 22 Apr 2016 00:59:55 +0000 (00:59 +0000)]
Fix bug where a bonded device could enter BONDING and BONDED states again. am:
b32b3d7c1b am:
75144cbf50 -s ours
am:
7ccd32ae54
* commit '
7ccd32ae549e4b09e72fcfc703176ec4b08be711':
Fix bug where a bonded device could enter BONDING and BONDED states again.
Change-Id: I9a221c156603556d1cfe581ae578411ca0e86c03
Sharvil Nanavati [Fri, 22 Apr 2016 00:57:41 +0000 (00:57 +0000)]
Fix bug where a bonded device could enter BONDING and BONDED states again. am:
b32b3d7c1b
am:
75144cbf50 -s ours
* commit '
75144cbf50803fabeabc2f6d61700e7df69e7059':
Fix bug where a bonded device could enter BONDING and BONDED states again.
Change-Id: Ifb35e23636d7350ef6bbffb8758b2e5f0839b750
Sharvil Nanavati [Fri, 22 Apr 2016 00:39:29 +0000 (00:39 +0000)]
Merge "Fix crash in HFP client\'s +COPS parsing code." into cw-e-dev am:
bf8d17ddbb am:
878da372c6
am:
61924c675c
* commit '
61924c675c1d053c1991cb0ec336f6291c1b6896':
Fix crash in HFP client's +COPS parsing code.
Change-Id: I86a29cfc50f1f672694f9d3effc44e9d4f33cd93
Sharvil Nanavati [Fri, 22 Apr 2016 00:39:28 +0000 (00:39 +0000)]
Only send first 16 characters of operator name in +COPS. am:
61b8ebf698 am:
9837f7e339
am:
bf3e06bbd0
* commit '
bf3e06bbd03a419b49e987e4d95e3e0b4fb99a71':
Only send first 16 characters of operator name in +COPS.
Change-Id: I3700e4396c6b3725209e7686f3bb557344201318
Marie Janssen [Fri, 22 Apr 2016 00:39:28 +0000 (00:39 +0000)]
Fix crashes with lots of discovered LE devices am:
a8ace3826b -s ours
am:
18b4207c27
* commit '
18b4207c27845a9293dc70677fa8328d427714ac':
Fix crashes with lots of discovered LE devices
Change-Id: I28d4d882f0a78fc75fe2619a076390d1b35b2aa5
Sharvil Nanavati [Fri, 22 Apr 2016 00:37:31 +0000 (00:37 +0000)]
Merge "Fix crash in HFP client\'s +COPS parsing code." into cw-e-dev am:
bf8d17ddbb
am:
878da372c6
* commit '
878da372c65941f6d8dd5eac0317a14f9728e7fd':
Fix crash in HFP client's +COPS parsing code.
Change-Id: I989ea8f8c0ff85d415bbf8b542d42fb39bbb7879
Sharvil Nanavati [Fri, 22 Apr 2016 00:37:30 +0000 (00:37 +0000)]
Only send first 16 characters of operator name in +COPS. am:
61b8ebf698
am:
9837f7e339
* commit '
9837f7e339e6e80aaf234b80b8ff07cf09faddc0':
Only send first 16 characters of operator name in +COPS.
Change-Id: I976b7618610287db0ce2c337a2fde44f3b5d31a9
Marie Janssen [Fri, 22 Apr 2016 00:37:19 +0000 (00:37 +0000)]
Fix crashes with lots of discovered LE devices
am:
a8ace3826b -s ours
* commit '
a8ace3826b05d1ade5beb5ef2ba4dfd8d9cf98b6':
Fix crashes with lots of discovered LE devices
Change-Id: Ie1c67a4f78c3039b58702d7a80a5ad33ff3870ff
Andre Eisenbach [Fri, 22 Apr 2016 00:26:09 +0000 (00:26 +0000)]
DO NOT MERGE Blacklist devices for absolute volume control am:
bef34921ee -s ours
am:
2a87344c16
* commit '
2a87344c16cf5e20fb3de43a47c0d2ac934fd0e1':
DO NOT MERGE Blacklist devices for absolute volume control
Change-Id: Ieb12a4fe495f4591f557058141088661b01c6deb
Ian Pedowitz [Fri, 22 Apr 2016 00:26:09 +0000 (00:26 +0000)]
Revert "Blacklist devices for absolute volume control" am:
22c5f47b7f -s ours
am:
bb883109d3
* commit '
bb883109d3ada0d9bd5338e1fd2dda0658f7e246':
Revert "Blacklist devices for absolute volume control"
Change-Id: I8b24a6d015df5ca6eb19d266765e58b22e7879b1
Andre Eisenbach [Fri, 22 Apr 2016 00:23:43 +0000 (00:23 +0000)]
DO NOT MERGE Blacklist devices for absolute volume control
am:
bef34921ee -s ours
* commit '
bef34921ee313f8378059d3205ebb485498b3404':
DO NOT MERGE Blacklist devices for absolute volume control
Change-Id: Id0ecff030d77833525fbecfea6c8fc9d029579ef
Ian Pedowitz [Fri, 22 Apr 2016 00:23:31 +0000 (00:23 +0000)]
Revert "Blacklist devices for absolute volume control"
am:
22c5f47b7f -s ours
* commit '
22c5f47b7f7bc4739fb1ddf85eb81d8b20f7b222':
Revert "Blacklist devices for absolute volume control"
Change-Id: Iab1a73d729f578e5e82688fb4c3e5aa1455db729
Andre Eisenbach [Thu, 21 Apr 2016 23:44:34 +0000 (23:44 +0000)]
Blacklist devices for absolute volume control am:
2c8897ca35 -s ours
am:
468959406b
* commit '
468959406b34704854928e176e7d15c153f51643':
Blacklist devices for absolute volume control
Change-Id: I7db4436c20ac1dc70d009f287fbb860e51b6b1b5
Andre Eisenbach [Thu, 21 Apr 2016 23:42:20 +0000 (23:42 +0000)]
Blacklist devices for absolute volume control
am:
2c8897ca35 -s ours
* commit '
2c8897ca35a93148619d662df03bd9da1b73679a':
Blacklist devices for absolute volume control
Change-Id: I5f0cbd1030b0e039ffcc04ae7a109f127a6acefa
Ajay Panicker [Thu, 21 Apr 2016 23:36:57 +0000 (23:36 +0000)]
Protect config module init and add date to config file am:
646134e0a0
am:
d20e92dfe1
* commit '
d20e92dfe1739d42d57effd26eaa95ddf158bc95':
Protect config module init and add date to config file
Change-Id: I2cc7debaf3861a9737d73262c845ab64300ec630
Ajay Panicker [Thu, 21 Apr 2016 23:34:37 +0000 (23:34 +0000)]
Protect config module init and add date to config file
am:
646134e0a0
* commit '
646134e0a04459f649cb50aa9f3272054630c345':
Protect config module init and add date to config file
Change-Id: Ie226b162fd335fb3a31741e33ba987271d39e9d9
Ajay Panicker [Mon, 18 Apr 2016 18:31:48 +0000 (11:31 -0700)]
Protect config module init and add date to config file
Bug:
27354612
Change-Id: I45c3c46cf9be81b9d235cfef68343413c98b6d4a
Sharvil Nanavati [Thu, 21 Apr 2016 22:38:12 +0000 (22:38 +0000)]
Merge "Fix absolute volume reporting if AVRC_ADV_CTRL_INCLUDED is false" into cw-e-dev am:
3c8de06896 am:
b35d5c358e
am:
5b37f79e69
* commit '
5b37f79e69991cebb18f3d08230f5c86e48f8091':
Fix absolute volume reporting if AVRC_ADV_CTRL_INCLUDED is false
Change-Id: I43137014f0224d71b6ec657ecc06603198f9eab5
Scott James Remnant [Thu, 21 Apr 2016 22:38:12 +0000 (22:38 +0000)]
DO NOT MERGE ANYWHERE net_test_bluetooth: replace with gtest variant am:
786a7e5941 -s ours am:
919642a4cd -s ours
am:
c7324d0450 -s ours
* commit '
c7324d045007e992ef5c57a300fdba60c5a3f1b0':
DO NOT MERGE ANYWHERE net_test_bluetooth: replace with gtest variant
Change-Id: I76da46067a4233cd7b4940cb7eab7c6646e3022f
Joshua Schwarz [Thu, 21 Apr 2016 22:38:12 +0000 (22:38 +0000)]
Merge "DO NOT MERGE ANYWHERE Rename gtest_net_test_bluedroid to gtest_net_test_bluetooth." into cw-e-dev am:
78ec0dc441 -s ours am:
c20ef5387b -s ours
am:
d9a1f5d701 -s ours
* commit '
d9a1f5d7012b165eba6a53747cd214c4f10fe9f3':
DO NOT MERGE ANYWHERE Rename gtest_net_test_bluedroid to gtest_net_test_bluetooth.
Change-Id: Id9a5fafa8e363ae9ec0cba7e5ec2597923a04eb3
Devin Kim [Thu, 21 Apr 2016 22:38:11 +0000 (22:38 +0000)]
Fix BT connection failures am:
198abcd704 am:
e6fdbaf8a7
am:
d1414e5a0c
* commit '
d1414e5a0cafb8a0aa879e5abf6522a0067b8f7a':
Fix BT connection failures
Change-Id: Ifeb8dbc0de111f6dd752f0fb65046f301a4d043f
Alain Vongsouvanh [Thu, 21 Apr 2016 22:38:11 +0000 (22:38 +0000)]
DO NOT MERGE ANYWHERE: osi: Remove error_fclose goto and redundant fflush. am:
e52633cecf -s ours am:
2be2e45a99 -s ours
am:
732d8e6c9f -s ours
* commit '
732d8e6c9f2a3eaec54735cb47a72135513d36c2':
DO NOT MERGE ANYWHERE: osi: Remove error_fclose goto and redundant fflush.
Change-Id: I3c22ffbc4cba2dd42058fc6bac1e56aa9f39dc75
Amadeusz Slawinski [Thu, 21 Apr 2016 22:38:10 +0000 (22:38 +0000)]
DO NOT MERGE ANYWHERE: Add file write error checks to config_save am:
02f35e6a36 -s ours am:
99184508a2 -s ours
am:
ff8418194a -s ours
* commit '
ff8418194a320f8b2da714eba6669887b4239105':
DO NOT MERGE ANYWHERE: Add file write error checks to config_save
Change-Id: Ib5d5d9e835db015b9c8c27e5a1485fee3036fda5
Chris Elliott [Thu, 21 Apr 2016 22:38:10 +0000 (22:38 +0000)]
Merge "DO NOT MERGE Revert "A2DP SRC offload support"" into mnc-dr1.5-dev am:
e0800b66e0 -s ours
am:
53a3d4c76e
* commit '
53a3d4c76e57630f66a1d63a7cd9035fbf3474f3':
DO NOT MERGE Revert "A2DP SRC offload support"
Change-Id: I4ec7a9019a67c07a6d2fcee360c6e9d46232a358
Chris Elliott [Thu, 21 Apr 2016 22:38:09 +0000 (22:38 +0000)]
DO NOT MERGE Revert "Make default SBC bitrate configurable by device." am:
a09c5aad67 -s ours
am:
685b9a12f0
* commit '
685b9a12f08ebbe801f9cb09e8ec6590d590c619':
DO NOT MERGE Revert "Make default SBC bitrate configurable by device."
Change-Id: I8e9875d62dfc8bfbcb462f31da2b2fa7cf98cceb
Chris Elliott [Thu, 21 Apr 2016 22:38:08 +0000 (22:38 +0000)]
DO NOT MERGE Revert "Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE." am:
775667a632 -s ours
am:
577d17061c
* commit '
577d17061c2d6399fcea7392a987583de6bba0ec':
DO NOT MERGE Revert "Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE."
Change-Id: Ibcddaf97411658c58760c97b7d1c11e6f786a137
Zach Johnson [Thu, 21 Apr 2016 22:38:07 +0000 (22:38 +0000)]
Merge "Mark secure link as authenticated for LE" into cw-e-dev am:
e6242fcf30 am:
a7945b11ce
am:
b0216ef7d3
* commit '
b0216ef7d3a726530eaec595c5296fc876ff63cc':
Mark secure link as authenticated for LE
Change-Id: Ic57355058ec4006023b05d9d1f7f6b90c9f45258
Sridhar Vashist [Thu, 21 Apr 2016 22:38:07 +0000 (22:38 +0000)]
Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE. am:
8b1c7af03a am:
9c55e7e6e0
am:
bef41e6fd5
* commit '
bef41e6fd5cd8ecef43319812c779e22d1805761':
Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE.
Change-Id: Ia60e12467915ee0192a459809fdde5a0095ca956
Sridhar Vashist [Thu, 21 Apr 2016 22:38:06 +0000 (22:38 +0000)]
Make default SBC bitrate configurable by device. am:
5f308397b7 am:
b2019873c6
am:
97253ccb9e
* commit '
97253ccb9e6706d9db1333ba44f4c868398dfa25':
Make default SBC bitrate configurable by device.
Change-Id: Ie8c5cbce126859003921fb67d96440d70e53f577
Chris Elliott [Thu, 21 Apr 2016 22:38:05 +0000 (22:38 +0000)]
Merge "A2DP SRC offload support" into cw-e-dev am:
ffdfe1d26d am:
51c3eb6a0c -s ours
am:
542812eb7c
* commit '
542812eb7c0d48f0dc8a1cdc46f1489e48550ac4':
A2DP SRC offload support
Change-Id: Idca1accb9deabea37edf7befb92070b3f54e5b4c
Sharvil Nanavati [Thu, 21 Apr 2016 22:35:58 +0000 (22:35 +0000)]
Merge "Fix absolute volume reporting if AVRC_ADV_CTRL_INCLUDED is false" into cw-e-dev am:
3c8de06896
am:
b35d5c358e
* commit '
b35d5c358e546657bfa2195a260a9ef4301318bc':
Fix absolute volume reporting if AVRC_ADV_CTRL_INCLUDED is false
Change-Id: Ic4827eab53322da5cc88affe2c5d9014ac6b2e56
Scott James Remnant [Thu, 21 Apr 2016 22:35:56 +0000 (22:35 +0000)]
DO NOT MERGE ANYWHERE net_test_bluetooth: replace with gtest variant am:
786a7e5941 -s ours
am:
919642a4cd -s ours
* commit '
919642a4cdcc2d6a112a5a6dfebc6f8e60f706ed':
DO NOT MERGE ANYWHERE net_test_bluetooth: replace with gtest variant
Change-Id: I3ae03e08d4d15670e0f6c4e622c0a105da932868
Joshua Schwarz [Thu, 21 Apr 2016 22:35:55 +0000 (22:35 +0000)]
Merge "DO NOT MERGE ANYWHERE Rename gtest_net_test_bluedroid to gtest_net_test_bluetooth." into cw-e-dev am:
78ec0dc441 -s ours
am:
c20ef5387b -s ours
* commit '
c20ef5387b82642a5e3320083dc0a76efe5fbfb7':
DO NOT MERGE ANYWHERE Rename gtest_net_test_bluedroid to gtest_net_test_bluetooth.
Change-Id: Ib426458adec10205067a94a85cab2d3d7f67bbdb
Devin Kim [Thu, 21 Apr 2016 22:35:53 +0000 (22:35 +0000)]
Fix BT connection failures am:
198abcd704
am:
e6fdbaf8a7
* commit '
e6fdbaf8a74e95c54b1333ed631061ce5a68d22f':
Fix BT connection failures
Change-Id: I1f663b6dcde84e9517e9fc226598e74b711c479e
Alain Vongsouvanh [Thu, 21 Apr 2016 22:35:52 +0000 (22:35 +0000)]
DO NOT MERGE ANYWHERE: osi: Remove error_fclose goto and redundant fflush. am:
e52633cecf -s ours
am:
2be2e45a99 -s ours
* commit '
2be2e45a991f8f7dfcd0b4443e2d19f4117912db':
DO NOT MERGE ANYWHERE: osi: Remove error_fclose goto and redundant fflush.
Change-Id: Ib411b7d4676cc8456bc51e5891112d71538532a5
Amadeusz Slawinski [Thu, 21 Apr 2016 22:35:50 +0000 (22:35 +0000)]
DO NOT MERGE ANYWHERE: Add file write error checks to config_save am:
02f35e6a36 -s ours
am:
99184508a2 -s ours
* commit '
99184508a236c839db86ae92c97c585a9cd3d2aa':
DO NOT MERGE ANYWHERE: Add file write error checks to config_save
Change-Id: If6a034f76c58180b3e3ea6c8be88032b35c5b225
Chris Elliott [Thu, 21 Apr 2016 22:35:49 +0000 (22:35 +0000)]
Merge "DO NOT MERGE Revert "A2DP SRC offload support"" into mnc-dr1.5-dev
am:
e0800b66e0 -s ours
* commit '
e0800b66e011139186f89d0387a6c86fcc5b6ec7':
DO NOT MERGE Revert "A2DP SRC offload support"
Change-Id: I0cf27fb610f6a24ccc0eaf9dc5641f5034167411
Chris Elliott [Thu, 21 Apr 2016 22:35:47 +0000 (22:35 +0000)]
DO NOT MERGE Revert "Make default SBC bitrate configurable by device."
am:
a09c5aad67 -s ours
* commit '
a09c5aad672222130e2a3c03c9a9317b56541dd1':
DO NOT MERGE Revert "Make default SBC bitrate configurable by device."
Change-Id: I1e31bdc958154617f490a9e6825d82170657187e
Chris Elliott [Thu, 21 Apr 2016 22:35:46 +0000 (22:35 +0000)]
DO NOT MERGE Revert "Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE."
am:
775667a632 -s ours
* commit '
775667a632ab5e8e14ced69828af65b27978f1b6':
DO NOT MERGE Revert "Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE."
Change-Id: Ia111f7d01ab94430a6e3be64b4c442852f28bdf6
Zach Johnson [Thu, 21 Apr 2016 22:35:44 +0000 (22:35 +0000)]
Merge "Mark secure link as authenticated for LE" into cw-e-dev am:
e6242fcf30
am:
a7945b11ce
* commit '
a7945b11ce231d53f5ced337136cd34ee8e5eea3':
Mark secure link as authenticated for LE
Change-Id: I2340c1c65f8caf504837eab01c9e458cc2c5882b
Sridhar Vashist [Thu, 21 Apr 2016 22:35:42 +0000 (22:35 +0000)]
Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE. am:
8b1c7af03a
am:
9c55e7e6e0
* commit '
9c55e7e6e0816caf83c263fd0ef7e4c4410fb46f':
Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE.
Change-Id: I87df5fafbd77a06e5c0ff797a57868caafa9f57d
Sridhar Vashist [Thu, 21 Apr 2016 22:35:40 +0000 (22:35 +0000)]
Make default SBC bitrate configurable by device. am:
5f308397b7
am:
b2019873c6
* commit '
b2019873c6253f29026b473ad92e417796c7a166':
Make default SBC bitrate configurable by device.
Change-Id: I2257bf7a4f6e24d1995f93469268021476c1f829
Chris Elliott [Thu, 21 Apr 2016 22:35:27 +0000 (22:35 +0000)]
Merge "A2DP SRC offload support" into cw-e-dev am:
ffdfe1d26d
am:
51c3eb6a0c -s ours
* commit '
51c3eb6a0c3b55183d30881180982f62c48dba95':
A2DP SRC offload support
Change-Id: I9f7967ca1b27fa8bc498c6f9b20d6049fd8e384a
Sharvil Nanavati [Thu, 21 Apr 2016 22:03:57 +0000 (22:03 +0000)]
Merge "Fix assertion failure in btif_sock_rfc" am:
1423f8c4ba
am:
7b08c8324a
* commit '
7b08c8324ad9acfe06b9bdd6484ffd5b356695c7':
Fix assertion failure in btif_sock_rfc
Change-Id: I2c6cb57ad33e774730c18aa499ab85b5b5d2d424
Sharvil Nanavati [Thu, 21 Apr 2016 21:59:06 +0000 (21:59 +0000)]
Merge "Fix assertion failure in btif_sock_rfc"
am:
1423f8c4ba
* commit '
1423f8c4babd9ecb2b4faf702601e734eecd9a08':
Fix assertion failure in btif_sock_rfc
Change-Id: Ib5e970bb1e2f5e37cd778abeb415ea253e52013c
Sharvil Nanavati [Thu, 21 Apr 2016 21:54:55 +0000 (21:54 +0000)]
Merge "Fix assertion failure in btif_sock_rfc"
Pavlin Radoslavov [Thu, 21 Apr 2016 19:40:40 +0000 (19:40 +0000)]
Merge "Add missing init/destroy of state_lock mutex" into nyc-dev
am:
271e208b7a
* commit '
271e208b7a48a78664f34e1476a4542bf7b3f7d5':
Add missing init/destroy of state_lock mutex
Change-Id: I7b9db5ffc793bb8b712fc6f6be164ba2e4bd3b0c
TreeHugger Robot [Thu, 21 Apr 2016 19:36:59 +0000 (19:36 +0000)]
Merge "Add missing init/destroy of state_lock mutex" into nyc-dev
Marie Janssen [Thu, 21 Apr 2016 18:39:57 +0000 (18:39 +0000)]
btif: add count of devices loaded on startup
am:
a042f8a022
* commit '
a042f8a02288e69154c405bbdf93c412a14da8bd':
btif: add count of devices loaded on startup
Change-Id: I58f80ca8f26b1b43b27d8f861ea2267dfb9f54d6
Marie Janssen [Wed, 13 Apr 2016 19:43:03 +0000 (12:43 -0700)]
btif: add count of devices loaded on startup
Report devices initially loaded from the config file.
Also removes the config mutex from btif_debug_config_dump as the config
is not modified.
Bug:
27354612
Change-Id: I25033ce28744051412f0d2bd554f0651e807ba7c
Pavlin Radoslavov [Wed, 20 Apr 2016 19:06:08 +0000 (12:06 -0700)]
Add missing init/destroy of state_lock mutex
Add missing init/destroy of state_lock mutex inside file
btif_sock_l2cap.c.
Also, add a missing unlock for the same mutex.
Bug:
28296454
Change-Id: I48b8deb911d29e8dcc6b7243fd61fc3ba69046dd
Pavlin Radoslavov [Thu, 21 Apr 2016 17:56:32 +0000 (17:56 +0000)]
Add missing init/destroy of state_lock mutex am:
4aa6d30d1c
am:
e6d8a2a1b7
* commit '
e6d8a2a1b7a63326a4d9a6dd0b6f23c94a38596f':
Add missing init/destroy of state_lock mutex
Change-Id: I2f82048b0d60c0cb731cd4645b5afa809235f424
Pavlin Radoslavov [Thu, 21 Apr 2016 17:54:19 +0000 (17:54 +0000)]
Add missing init/destroy of state_lock mutex
am:
4aa6d30d1c
* commit '
4aa6d30d1cde7e261e240e0eb2afc0d5a1803757':
Add missing init/destroy of state_lock mutex
Change-Id: If067e17a1fb5885acbbde0768851666c29bb75f4
Pavlin Radoslavov [Wed, 20 Apr 2016 19:06:08 +0000 (12:06 -0700)]
Add missing init/destroy of state_lock mutex
Add missing init/destroy of state_lock mutex inside file
btif_sock_l2cap.c.
Also, add a missing unlock for the same mutex.
Bug:
28296454
Change-Id: I48b8deb911d29e8dcc6b7243fd61fc3ba69046dd
Sharvil Nanavati [Wed, 20 Apr 2016 17:49:10 +0000 (10:49 -0700)]
Fix assertion failure in btif_sock_rfc
The BTIF RFCOMM code was ignoring the status code on RFCOMM writes. In
the failure case, the slot id is 0 which is invalid. But the slot id
shouldn't even be referenced since the result was failure.
Stack trace:
__assert2+20 bionic/libc/bionic/assert.cpp:40
find_rfc_slot_by_id+18 system/bt/main/../btif/src/btif_sock_rfc.c:144
on_rfc_write_done system/bt/main/../btif/src/btif_sock_rfc.c:537
rfcomm_cback+632 system/bt/main/../btif/src/btif_sock_rfc.c:585
bta_jv_rfcomm_write+74 system/bt/bta/./jv/bta_jv_act.c:2121
bta_jv_sm_execute+18 system/bt/bta/./jv/bta_jv_main.c:93
bta_sys_event+56 system/bt/bta/./sys/bta_sys_main.c:523
run_reactor+254 system/bt/osi/./src/reactor.c:278
run_thread+142 system/bt/osi/./src/thread.c:209
__pthread_start(void*)+30 bionic/libc/bionic/pthread_create.cpp:199
__start_thread+6 bionic/libc/bionic/clone.cpp:41
Bug:
27819511
Change-Id: Ifcd19fdfb214559f345567f04db8146b30037363
Bluetooth Build Test [Thu, 21 Apr 2016 15:51:25 +0000 (15:51 +0000)]
Fix sluggish HID devices am:
46b8d12b92
am:
6f0a6f757d
* commit '
6f0a6f757d8c6de5863c83d009529df0292fb414':
Fix sluggish HID devices
Change-Id: I6f94e486022b40d4a784adf0dfa74a67e972c1c3
Bluetooth Build Test [Thu, 21 Apr 2016 15:49:15 +0000 (15:49 +0000)]
Fix sluggish HID devices
am:
46b8d12b92
* commit '
46b8d12b92e74dc03cd17a77a3365cd4d96902f4':
Fix sluggish HID devices
Change-Id: I8e50c5a89094b31fd0e2400d2e060c9b06f4e356
Jakub Pawlowski [Thu, 21 Apr 2016 15:49:13 +0000 (15:49 +0000)]
Cleanup unnecessary logs
am:
5be7c78326
* commit '
5be7c7832613abbd5c7a00d447e82c3a45a27e24':
Cleanup unnecessary logs
Change-Id: I82e08c85170059ae2c3b9320223e1c300c755d7f
Bluetooth Build Test [Wed, 13 Apr 2016 14:39:53 +0000 (16:39 +0200)]
Fix sluggish HID devices
Right now, when connecting to HID devices, preferred connection
parameters are not being used. This is because of bug in GAP profile.
This make all HID devices use default connection parameters, which
mean that they behave sluggish. This patch fixes that by forcing
HID devices to re-read connection parameters on each reconnection.
This is a temporary workaround until GAP is rewritten.
Change-Id: I74b70ad8e96c29517cace808632fe4d8e0251994
Jakub Pawlowski [Tue, 12 Apr 2016 12:50:49 +0000 (05:50 -0700)]
Cleanup unnecessary logs
Bug:
27698756
Change-Id: I30b5e4b45d4b06e0264415e85949c7bf828f28c0
Bluetooth Build Test [Thu, 21 Apr 2016 00:02:31 +0000 (00:02 +0000)]
Enable test_vendor_lib compilation on Linux am:
aabb300
am:
8db0906
* commit '
8db0906884908ee8beb0e34f2a7ce2185d47f3f3':
Enable test_vendor_lib compilation on Linux
Change-Id: Iae95443e6c6886f3439853e675507c2d6f213264
Bluetooth Build Test [Wed, 20 Apr 2016 23:58:50 +0000 (23:58 +0000)]
Enable test_vendor_lib compilation on Linux
am:
aabb300
* commit '
aabb3008aa03ad95339cf1a818c025301cbc14d3':
Enable test_vendor_lib compilation on Linux
Change-Id: Ic75011df40615323592343247794769d66b99ba1
Bluetooth Build Test [Wed, 20 Apr 2016 19:35:28 +0000 (12:35 -0700)]
Enable test_vendor_lib compilation on Linux
Cristian Iorga [Wed, 20 Apr 2016 23:45:46 +0000 (23:45 +0000)]
vendor_libs: create Android.mk am:
6f2ae30
am:
fcc2c62
* commit '
fcc2c62c5e43c7f31cbc3f3d77f42d2ff6873323':
vendor_libs: create Android.mk
Change-Id: I7dbfa574efbc652c359f104f167b0c7ac1a1e1ee
Cristian Iorga [Wed, 20 Apr 2016 20:52:55 +0000 (20:52 +0000)]
vendor_libs: create Android.mk
am:
6f2ae30
* commit '
6f2ae3021d3487ef00dd76f9bfb8ace8b7069b7d':
vendor_libs: create Android.mk
Change-Id: I4e07e95b8b609cbd5625968c9daa5618edf2ddd7
Cristian Iorga [Tue, 15 Mar 2016 14:33:08 +0000 (16:33 +0200)]
vendor_libs: create Android.mk
all-subdir-makefiles call works for only one
nested sublevels, so we need to add a default
Android.mk in order to be able to build libbt-vendor module.
BUG=
28014054
Change-Id: I7cc004d2a4dd6216a80d13c6384d9dcde328323e
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Jakub Pawlowski [Wed, 20 Apr 2016 16:03:38 +0000 (16:03 +0000)]
Merge "vendor_libs: test_vendor_lib: fix build" am:
67a29d6
am:
434889f
* commit '
434889fbc8c165c76048e832540cd22245bc76ba':
vendor_libs: test_vendor_lib: fix build
Change-Id: I95f82d9aa2d1fba852aa7ba0e065ab8b87f57d73
Cristian Iorga [Wed, 20 Apr 2016 16:00:24 +0000 (16:00 +0000)]
Merge "vendor_libs: test_vendor_lib: fix build"
am:
67a29d6
* commit '
67a29d6259335cd12f6eb7f6daaec1785ed68d03':
vendor_libs: test_vendor_lib: fix build
Change-Id: I21eef55cf5f3af64de9b0eb44df67b9ba300a683
Jakub Pawlowski [Wed, 20 Apr 2016 15:51:39 +0000 (15:51 +0000)]
Merge "vendor_libs: test_vendor_lib: fix build"
Andreas Gampe [Wed, 20 Apr 2016 05:35:42 +0000 (22:35 -0700)]
BT: Remove double definition
Mistake in merging.
Change-Id: If1db032a5320b3756ff8455c0c7b8ca9649bb707
Ajay Panicker [Wed, 20 Apr 2016 02:39:03 +0000 (19:39 -0700)]
resolve merge conflicts of
c7087d2 to nyc-dev-plus-aosp
Change-Id: I3181c8d053aaac5563a9f87fdc904bf087d3adf5
Ajay Panicker [Tue, 19 Apr 2016 21:49:47 +0000 (21:49 +0000)]
Add guest mode functionality (2/4) am:
7b266be
am:
88c5489
* commit '
88c548971df3b09389e7e586a4b74efc1a9d0e55':
Add guest mode functionality (2/4)
Change-Id: I51c5f4b9a3d7a59d663c4fda7e3c12119716bb66
Ajay Panicker [Tue, 19 Apr 2016 21:45:56 +0000 (21:45 +0000)]
Add guest mode functionality (2/4)
am:
7b266be
* commit '
7b266be449e4f915c419199c2312eb31f70e63bc':
Add guest mode functionality (2/4)
Change-Id: I68b38a608df104203ce9007121d3d085bede81b0
Cristian Iorga [Mon, 18 Apr 2016 13:09:31 +0000 (16:09 +0300)]
vendor_libs: test_vendor_lib: fix build
Change-Id: I1ba531c5289adea3fa5d6f9e0f68cf241a127219
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Ajay Panicker [Fri, 18 Mar 2016 00:09:24 +0000 (17:09 -0700)]
Add guest mode functionality (2/5)
Add a flag to enable() to start Bluetooth in restricted
mode. In restricted mode, all devices that are paired during
restricted mode are deleted upon leaving restricted mode.
Right now restricted mode is only entered while a guest
user is active.
Bug:
27410683
Change-Id: I8f23d28ef0aa3a8df13d469c73005c8e1b894d19
Ajay Panicker [Fri, 18 Mar 2016 00:09:24 +0000 (17:09 -0700)]
Add guest mode functionality (2/4)
Add a flag to enable() to start Bluetooth in restricted
mode. In restricted mode, all devices that are paired during
restricted mode are deleted upon leaving restricted mode.
Right now restricted mode is only entered while a guest
user is active.
Bug:
27410683
Change-Id: I19ff91d1d7fb8c60230fee7a05d32574b5b2aeda
Jakub Pawlowski [Mon, 18 Apr 2016 17:46:59 +0000 (17:46 +0000)]
Use base from libchrome am:
9f19410
am:
5f23b6f
* commit '
5f23b6fa7180f71b7aad728aa87840c619e1204e':
Use base from libchrome
Change-Id: I453e5395919fc3235c80b98e3c21425fd4b3dd78
Jakub Pawlowski [Mon, 18 Apr 2016 17:41:41 +0000 (17:41 +0000)]
Use base from libchrome
am:
9f19410
* commit '
9f19410236243d5f631582f4978df27771ff03fb':
Use base from libchrome
Change-Id: I047ce07c58ba805721f6d4895fe795b520dd7fee
Jakub Pawlowski [Mon, 18 Apr 2016 17:00:26 +0000 (10:00 -0700)]
Use base from libchrome
Change-Id: I57230618ef8653a168d69f871f88714ab339408a
Cristian Iorga [Mon, 18 Apr 2016 16:32:18 +0000 (16:32 +0000)]
Fix Linux libbt-vendor build am:
8d79346
am:
c7d0e75
* commit '
c7d0e75c97f7f18f198ec2f1f3def46ad6629412':
Fix Linux libbt-vendor build
Change-Id: Ib677d1d9afa49629f45cc820023c35734e1c7af8
Cristian Iorga [Mon, 18 Apr 2016 16:27:10 +0000 (16:27 +0000)]
Fix Linux libbt-vendor build
am:
8d79346
* commit '
8d793462d253ccb9ce619074b37f47a968fa8612':
Fix Linux libbt-vendor build
Change-Id: I501e221f8d25ee038814ccab53ef33dc33dc115d
Cristian Iorga [Wed, 30 Mar 2016 17:14:36 +0000 (20:14 +0300)]
Fix Linux libbt-vendor build
Fix enumeration values not explicitly handled in switch;
Fix the undefined reference to functions from libosi.
Change-Id: I64ab3d57d1c4879ad47ae1a03f8996287877535d
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Sharvil Nanavati [Fri, 15 Apr 2016 21:42:39 +0000 (21:42 +0000)]
Delete unused JV code
am:
17a1dfb
* commit '
17a1dfbadd39101faf713b2cd03a3428bda5e8da':
Delete unused JV code
Change-Id: I7205de534c2e684da70e71b2b620993d9d106c73
Sharvil Nanavati [Wed, 6 Apr 2016 21:46:49 +0000 (14:46 -0700)]
Delete unused JV code
Bug:
28068134
Change-Id: I16d017ef90269a435b8f66a58ed06d2fc89d407f
AnubhavGupta [Fri, 15 Apr 2016 21:00:47 +0000 (21:00 +0000)]
Merge "AVRCP: Update sdp record correctly for CT or TG." into nyc-dev
am:
1af9215
* commit '
1af921526690372da012fe9d9775626b07fa4452':
AVRCP: Update sdp record correctly for CT or TG.
Change-Id: Ice84045d0aae6e7ea9f1fd9cd6cf48ad1b3a20a3
Sanket Agarwal [Fri, 15 Apr 2016 20:50:44 +0000 (20:50 +0000)]
Merge "AVRCP: Update sdp record correctly for CT or TG." into nyc-dev
Sanket Agarwal [Fri, 15 Apr 2016 20:37:49 +0000 (20:37 +0000)]
Merge "Allow A2DP SNK audio track focus gain interface." into nyc-dev
am:
372e4d4
* commit '
372e4d4120a547f5b9d3a5db0f12622a8cfad5c5':
Allow A2DP SNK audio track focus gain interface.
Change-Id: Id82893b4f5969a9c759f20fc8dcf6697361ceea0
Sanket Agarwal [Fri, 15 Apr 2016 20:23:49 +0000 (20:23 +0000)]
Merge "Allow A2DP SNK audio track focus gain interface." into nyc-dev
Sanket Agarwal [Fri, 15 Apr 2016 20:10:45 +0000 (20:10 +0000)]
Allow A2DP SNK audio track focus gain interface. am:
501d671
am:
6c596f7
* commit '
6c596f743ec6cee290e1ea4d53139b546e0771fb':
Allow A2DP SNK audio track focus gain interface.
Change-Id: I29cec10eb809fa6bfc19d8d20b83c954eb5f1902
Sanket Agarwal [Fri, 15 Apr 2016 20:07:27 +0000 (20:07 +0000)]
Allow A2DP SNK audio track focus gain interface.
am:
501d671
* commit '
501d67199bfc5bf9c2d2a32f6eac5600320795fd':
Allow A2DP SNK audio track focus gain interface.
Change-Id: I62bc0064c9756d1bf615d8a795b3b520d333246e
Jakub Pawlowski [Fri, 15 Apr 2016 18:57:05 +0000 (18:57 +0000)]
Fix LE central device not being able to disconnect
am:
5b53ab9
* commit '
5b53ab9f5d2144f4d6c0a456f1781e89ec598fe2':
Fix LE central device not being able to disconnect
Change-Id: I98c71c9d5ad7bfcd65054f08f23e153c83da2816
Jakub Pawlowski [Fri, 15 Apr 2016 18:56:35 +0000 (18:56 +0000)]
Fix LE central device not being able to disconnect am:
6f74d76
am:
30acd82
* commit '
30acd82350466e073429fcf4f8a378178e6378e0':
Fix LE central device not being able to disconnect
Change-Id: I060d1b48bcef1430ba6c6816ea1cec62adc38c81
Jakub Pawlowski [Fri, 15 Apr 2016 18:53:10 +0000 (18:53 +0000)]
Fix LE central device not being able to disconnect
am:
6f74d76
* commit '
6f74d76a700e79217b6bba0a40860ba19fe06b3f':
Fix LE central device not being able to disconnect
Change-Id: I2179ef536d3a849f912665abc376b517e886dc67
Sanket Agarwal [Fri, 8 Apr 2016 18:26:04 +0000 (11:26 -0700)]
Allow A2DP SNK audio track focus gain interface.
In order to duck music we need to adjust the gain of the audio track
handled by A2DP SNK. Since SNK is implemented in native we need to add
interface to adjust the gain.
Bug: b/
28065071
Change-Id: I60634cfadb502e276596bcb3aafc62ef81d9023a
Jakub Pawlowski [Thu, 14 Apr 2016 10:06:54 +0000 (03:06 -0700)]
Fix LE central device not being able to disconnect
This fixes issue introduced in
https://android-review.googlesource.com/#/c/202278
Bug:
28211048
Change-Id: I08e62149358f1c1fc1759a4ca9eb375cb0ad8230