OSDN Git Service
Chenjie Luo [Sat, 30 Apr 2016 04:17:55 +0000 (04:17 +0000)]
Merge "DO NOT MERGE ANYWHERE Disconnect the AVDT connection for A2DP SRC device." into cw-e-dev am:
5084f0166e -s ours am:
2c8ae3d115 -s ours
am:
9f32b9e3cb -s ours
* commit '
9f32b9e3cb9a89b59f5185fa6968432beb83621c':
DO NOT MERGE ANYWHERE Disconnect the AVDT connection for A2DP SRC device.
Change-Id: I04fce367fcd467246b4399b84044c691430d37a2
Sharvil Nanavati [Sat, 30 Apr 2016 04:17:55 +0000 (04:17 +0000)]
DO NOT MERGE ANYWHERE am:
95f816945a -s ours am:
0e2a631634 -s ours
am:
813a0cb118 -s ours
* commit '
813a0cb118a44260943b418b197f5923c02c822c':
DO NOT MERGE ANYWHERE
Change-Id: I81723b3b6bc71d695c0d9312ab437ad9d755b771
Devin Kim [Sat, 30 Apr 2016 04:17:54 +0000 (04:17 +0000)]
Do not send AT+CHLD=? if the 3-way call feature is not supported am:
79dc36d01a am:
b616d01f01
am:
011012f605
* commit '
011012f6051cf27424d55e83ca959aaa4be641bf':
Do not send AT+CHLD=? if the 3-way call feature is not supported
Change-Id: I69ece01e2df5a1b47ef40e2540953668051f5515
Sathya Kumar [Sat, 30 Apr 2016 04:17:53 +0000 (04:17 +0000)]
DO NOT MERGE ANYWHERE Disable 3Mbps packets for AVDT ACL links am:
a8bb3ae08b -s ours am:
66f79db6e6 -s ours
am:
b6d3f76f84 -s ours
* commit '
b6d3f76f844110cf6b22d72b5704d93f3d40d553':
DO NOT MERGE ANYWHERE Disable 3Mbps packets for AVDT ACL links
Change-Id: I639c1335d58a86b4b26a08eaca871ee51882701a
Chenjie Luo [Sat, 30 Apr 2016 04:15:27 +0000 (04:15 +0000)]
Merge "DO NOT MERGE ANYWHERE Disconnect the AVDT connection for A2DP SRC device." into cw-e-dev am:
5084f0166e -s ours
am:
2c8ae3d115 -s ours
* commit '
2c8ae3d1153e1a69383171a8c5be50a894952132':
DO NOT MERGE ANYWHERE Disconnect the AVDT connection for A2DP SRC device.
Change-Id: I5efb950b73e2f30966013ccebc6366c9d3c2a10a
Sharvil Nanavati [Sat, 30 Apr 2016 04:15:25 +0000 (04:15 +0000)]
DO NOT MERGE ANYWHERE am:
95f816945a -s ours
am:
0e2a631634 -s ours
* commit '
0e2a631634ff759cba204b027284fa2ba3a07ba6':
DO NOT MERGE ANYWHERE
Change-Id: I90953865e007542f493d6da6c47599e71467b664
Devin Kim [Sat, 30 Apr 2016 04:15:24 +0000 (04:15 +0000)]
Do not send AT+CHLD=? if the 3-way call feature is not supported am:
79dc36d01a
am:
b616d01f01
* commit '
b616d01f01b8ebaa30629916556a86b423be758f':
Do not send AT+CHLD=? if the 3-way call feature is not supported
Change-Id: I478b834744c25f03d1202b1834279adb2c29d22a
Sathya Kumar [Sat, 30 Apr 2016 04:15:22 +0000 (04:15 +0000)]
DO NOT MERGE ANYWHERE Disable 3Mbps packets for AVDT ACL links am:
a8bb3ae08b -s ours
am:
66f79db6e6 -s ours
* commit '
66f79db6e607e3c51656a5532618b94c847118de':
DO NOT MERGE ANYWHERE Disable 3Mbps packets for AVDT ACL links
Change-Id: I1f3de149a2fc44b8ad6cc39341cd69349eeb3c82
Sharvil Nanavati [Sat, 30 Apr 2016 04:15:19 +0000 (04:15 +0000)]
resolve merge conflicts of
00a44d2 to nyc-dev
am:
5aa2f31c77
* commit '
5aa2f31c774c8a8c8b7b4d2e587ce921d4857403':
Per Motorola, we're going to revert this change and submit Moto-specific code for this.
Change-Id: I297de2cbbefc9a67fe72321499921dd0c523760d
Sharvil Nanavati [Sat, 30 Apr 2016 00:06:08 +0000 (17:06 -0700)]
resolve merge conflicts of
00a44d2 to nyc-dev
Change-Id: I64ef6cb1eb5996674e9919d13fadd43ede1d4b8c
Pankaj Kanwar [Fri, 29 Apr 2016 23:44:49 +0000 (23:44 +0000)]
resolve merge conflicts of
f7388e6 to nyc-dev
am:
4ec6f7603a
* commit '
4ec6f7603acaf453a1f280e2fad1a1d0e35dbfa5':
Offload config save functionality to BTIF thread
Change-Id: Ie34873f424479ddb93af79eef6f3072f38322f2e
Pavlin Radoslavov [Fri, 29 Apr 2016 22:12:33 +0000 (15:12 -0700)]
resolve merge conflicts of
f7388e6 to nyc-dev
Change-Id: I149778411a50fc5881b84cec01a2a4b43cbd2b5c
Sharvil Nanavati [Fri, 29 Apr 2016 20:46:35 +0000 (20:46 +0000)]
Fix build break caused by missing braces around struct initializer.
am:
b75ec300d2
* commit '
b75ec300d2e7e0725eddb0e43d99ac85fc7197c4':
Fix build break caused by missing braces around struct initializer.
Change-Id: I66d8378fbec221e8b552fed464252afcd4e7fced
Sharvil Nanavati [Fri, 29 Apr 2016 19:35:45 +0000 (12:35 -0700)]
Fix build break caused by missing braces around struct initializer.
Change-Id: Iba376e9e4fdcfc032bdd2d20a6de7ba18c8de98c
Andre Eisenbach [Fri, 29 Apr 2016 18:36:28 +0000 (18:36 +0000)]
Merge "Additional headsets blacklisted for absolute volume" into mnc-dr1.5-dev am:
006ede7ac2
am:
384d86594e
* commit '
384d86594e830c14c92d2fe29b32f56777b14a21':
Additional headsets blacklisted for absolute volume
Change-Id: I8391c3e5cd987c7c03293a963ba8208769b4aec5
Marie Janssen [Fri, 29 Apr 2016 18:36:27 +0000 (18:36 +0000)]
Fix crashes with lots of discovered LE devices am:
05419c8b96 am:
7a5fa57019 am:
0ff343e006 am:
6b0e6b5779
am:
1da6f76e96
* commit '
1da6f76e96afdbb76f4557987c696a0adb6df4f0':
Fix crashes with lots of discovered LE devices
Change-Id: If9a25f1de82e48b5fa941b0e284fb40d29af9a66
Andre Eisenbach [Fri, 29 Apr 2016 18:34:14 +0000 (18:34 +0000)]
Merge "Additional headsets blacklisted for absolute volume" into mnc-dr1.5-dev
am:
006ede7ac2
* commit '
006ede7ac2c509ca6cba4d34b3f048bb3b6f429f':
Additional headsets blacklisted for absolute volume
Change-Id: I268c859ba121f524147ba0a7878f1705d47b8976
Marie Janssen [Fri, 29 Apr 2016 18:34:12 +0000 (18:34 +0000)]
Fix crashes with lots of discovered LE devices am:
05419c8b96 am:
7a5fa57019 am:
0ff343e006
am:
6b0e6b5779
* commit '
6b0e6b57797bdf4af5656438404c91f7fe4f6ef1':
Fix crashes with lots of discovered LE devices
Change-Id: I4d45aa391459c932396c8f7bb06f24079da8f48c
Sharvil Nanavati [Fri, 29 Apr 2016 18:34:08 +0000 (18:34 +0000)]
resolve merge conflicts of
405ec18 to nyc-dev
am:
2ef994a0ab
* commit '
2ef994a0abccc556de97c22d517001801f344046':
Disable 3Mbps packets for AVDT ACL links
Change-Id: I4c69aabdc1f3e9dd14f6c44d07ac0809fe0b0915
Sharvil Nanavati [Thu, 28 Apr 2016 21:54:35 +0000 (14:54 -0700)]
resolve merge conflicts of
405ec18 to nyc-dev
Change-Id: I94b431287ae831d64dc734f8cd3f071e49a9d6eb
Pavlin Radoslavov [Tue, 26 Apr 2016 23:47:11 +0000 (23:47 +0000)]
Fix issues during cleanup stage of the Bluetooth stack
am:
3a44a7a
* commit '
3a44a7a4f6b2dec169097152739d7fdd38482b72':
Fix issues during cleanup stage of the Bluetooth stack
Change-Id: I6a97ed31f2779828ffe871f357d67881337bd069
Pavlin Radoslavov [Tue, 26 Apr 2016 19:18:36 +0000 (12:18 -0700)]
Fix issues during cleanup stage of the Bluetooth stack
* Moved free-ing of bta_av_cb timers from the init function
to the cleanup stage.
* Changed the usage of btif_jni_disassociate() so it is called
synchronously. Its previous usage was complicated -
the function was called asynchronously on a different thread,
and we had to wait on a future for its completion.
* Renamed function btif_shutdown_bluetooth() to
btif_cleanup_bluetooth() to represent better its purpose.
Similarly, bte_main_shutdown() is renamed to bte_main_cleanup()
Also:
* Removed function btif_init_fail(), because it is not used.
* Updated an error log message inside function
btif_in_execute_service_request() so the log information
is accurate and more useful.
* Updated the log messages related to the lifecycle of a module
in btcore/src/module.c
Bug:
26982349
Change-Id: Icd6f159d993bdb9c8ef09bfb5b1386b3d6ea4ff2
Andre Eisenbach [Tue, 26 Apr 2016 19:23:16 +0000 (19:23 +0000)]
Do not log unsolicited NOOP command complete events
am:
eb38505
* commit '
eb38505134c910b944ecb6de615d3705fb2b09d7':
Do not log unsolicited NOOP command complete events
Change-Id: I20f0945235a0d85e4d56f58c77a2c01dc47f6f3f
Andre Eisenbach [Tue, 26 Apr 2016 16:51:06 +0000 (09:51 -0700)]
Do not log unsolicited NOOP command complete events
Bug:
27744135
Change-Id: I683e3a9f0a116f83763ebcf4d0583ea1c89ef5b2
Andre Eisenbach [Tue, 26 Apr 2016 16:40:39 +0000 (16:40 +0000)]
Revert "Turn down excess logging in bt hci"
am:
0b39c0a
* commit '
0b39c0a0ee6c372f022268dcf76ca50e1cf2e4b3':
Revert "Turn down excess logging in bt hci"
Change-Id: Ief3b57f750aaab5395d514ba95da507b51bce7c6
Andre Eisenbach [Wed, 30 Mar 2016 03:26:13 +0000 (03:26 +0000)]
Revert "Turn down excess logging in bt hci"
This log message is likely very necessary and if you see this excessively, we will want to know about it...
This reverts commit
11cfdf303c420d14e6cf3e4d2ca856b827ba44cf.
Change-Id: Iefd46b7aab3373a1547d83c05166fa21034c51a0
Pavlin Radoslavov [Mon, 25 Apr 2016 21:50:27 +0000 (21:50 +0000)]
Fix a race condition during alarm_cleanup()
am:
97ec0a5
* commit '
97ec0a56f5282ee8977bc1dcb60bb86980e757d6':
Fix a race condition during alarm_cleanup()
Change-Id: I5c8a45f82d6184a5f2ce16e7467a3bb7ec51af3c
Pavlin Radoslavov [Mon, 25 Apr 2016 19:29:29 +0000 (12:29 -0700)]
Fix a race condition during alarm_cleanup()
Fix a race condition inside function alarm_cleanup() that
could be triggered during shutdown.
Also, fix few other issues:
* Add missing "timer_delete(akeup_timer)" statement inside
alarm_cleanup()
* Fix the argument when calling "timer_delete(timer)"
* Call "semaphore_free(alarm_expired)" inside alarm_cleanup()
after the corresponding "timer" and "wakeup_timer" have
been deleted.
* Fix the argument type when calling eventfd_read() inside
semaphore_wait()
Bug:
26982349
Change-Id: I2b00cd7ee7f56f755775f8e7b370006e31c6eb08
Bluetooth Build Test [Mon, 25 Apr 2016 21:28:43 +0000 (21:28 +0000)]
Fix sluggish HID devices
am:
3165425
* commit '
3165425aff5744bf682a2887e9704e66f8d34a87':
Fix sluggish HID devices
Change-Id: Ifa1a7911ac0baa332e8fc3ef5a6932c6c120c85b
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.
Bug:
28378306
Change-Id: I74b70ad8e96c29517cace808632fe4d8e0251994
Manu Viswanadhan [Sat, 23 Apr 2016 02:53:14 +0000 (02:53 +0000)]
Fix FD leak caused by module wrapper thread
am:
69b9e7c
* commit '
69b9e7c735c94ed9c4f3cad47be8f679bcad2e6b':
Fix FD leak caused by module wrapper thread
Change-Id: Ibd8069620f6b009c060288284c82ce15d7b48412
Manu Viswanadhan [Tue, 19 Apr 2016 09:28:40 +0000 (14:58 +0530)]
Fix FD leak caused by module wrapper thread
Use Case: Repeated BT ON/OFF
Failure: FD leak is observed with ON/OFF stress test
which eventually leads to crash due to unavailability
of FDs.
Steps:
BT ON/OFF.
Root Cause: During cleanup the module wrapper thread is
stopped but the resources are not freed, leading to FD leak.
Fix: Cleanup the module wrapper thread properly so that there
are no resource leaks.
Bug:
28312228
Change-Id: I4de2fba9c98a0e4ae73315759ec6bc8bf273948e
Pavlin Radoslavov [Sat, 23 Apr 2016 00:39:31 +0000 (00:39 +0000)]
Merge "Fix a Floating point exception for periodic timers" into nyc-dev
am:
ff86842
* commit '
ff868423456f3b3ab40646df8dccfff0c099aea7':
Fix a Floating point exception for periodic timers
Change-Id: Icd3b5350c089b3a077f6d176fbf29062b85553dd
Pavlin Radoslavov [Sat, 23 Apr 2016 00:34:12 +0000 (00:34 +0000)]
Merge "Improve debug-ability of the stack manager" into nyc-dev
am:
88c7f54
* commit '
88c7f54db69ded44b3017e6a1ccbc05352103683':
Improve debug-ability of the stack manager
Change-Id: I84826e37b9e7cac2a2c52cba882ebcb606dc0a36
Pavlin Radoslavov [Sat, 23 Apr 2016 00:34:11 +0000 (00:34 +0000)]
Add missing mutex lock/unlock inside alarm_cleanup()
am:
f338fb7
* commit '
f338fb754e00d51c31c96f755b05d8daf6006168':
Add missing mutex lock/unlock inside alarm_cleanup()
Change-Id: I2f05bdabb92117e8bd651ff039adf4e18c968c0e
TreeHugger Robot [Sat, 23 Apr 2016 00:33:11 +0000 (00:33 +0000)]
Merge "Fix a Floating point exception for periodic timers" into nyc-dev
TreeHugger Robot [Sat, 23 Apr 2016 00:25:47 +0000 (00:25 +0000)]
Merge "Improve debug-ability of the stack manager" into nyc-dev
Dan Albert [Fri, 22 Apr 2016 23:47:38 +0000 (23:47 +0000)]
Fix 64-bit build break.
am:
4d602cc
* commit '
4d602cc8c972c781ba23e7945a2dcd20fee40de3':
Fix 64-bit build break.
Change-Id: Id7297cb595f376341396c741a20c25ef83cfcc12
Pavlin Radoslavov [Wed, 20 Apr 2016 00:30:19 +0000 (17:30 -0700)]
Fix a Floating point exception for periodic timers
Fix a Floating point exception for periodic timers that are
scheduled with interval of 0ms, and add a corresponding unit test.
Also, fix a typo when printing "Action counts" statistics.
Bug:
28278593
Change-Id: Ic381efc573ed9954c36980c26a89318d2de40b29
Pavlin Radoslavov [Wed, 20 Apr 2016 02:20:01 +0000 (19:20 -0700)]
Improve debug-ability of the stack manager
Add or update existing log messages in the stack manager,
so it is clear when each of the init/startup/shutdown/cleanup
steps is executed and completed.
The added/updated log messages are at INFO level.
Bug:
26982349
Change-Id: Ie84aa8e96133999eb76c5b351ddd4fea56404ef0
Pavlin Radoslavov [Wed, 20 Apr 2016 02:16:26 +0000 (19:16 -0700)]
Add missing mutex lock/unlock inside alarm_cleanup()
Bug:
26982349
Change-Id: I32f4e6450491adcc1e12e71fb8bb582d6397a91a
Dan Albert [Fri, 22 Apr 2016 18:24:14 +0000 (11:24 -0700)]
Fix 64-bit build break.
Master (aosp and internal) has been broken for nearly two days now.
Was broken by https://android-review.googlesource.com/#/c/212244/
because no one checked 64-bit before merging.
No one noticed post-submit because the build servers aren't
checkbuilding any 64-bit targets (aside from mips64, which is broken
for other reasons).
I've uploaded a build change to get treehugger building a 64-bit
target (http://cr/
120564724), and also to make all the targets
checkbuilds again (http://cr/
120568746).
Change-Id: I195000284de5b52a539a47ad8b308990e72eea96
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: Ib7b26a5629e103e495ca3f9517e6bbfac6c6631d
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: I687d70455fa2dec1bb86d6d892aa1999d06b407f
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: Ibd48a507849bda83b3eb33b91b309f6f00e2b131
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: I0a78f89a3fa5c1e227ebbd6976156e9612a55e87
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: I7aa3d3ccd3514e69af6ec60b7c7aff60f5054684
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: I400ad72e10bd784f365153320e5c73f74036b9d5
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:05 +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: Ice9e6cba94d0c7ec3cc2872e8e3d6da7b07a865b
Ian Pedowitz [Fri, 22 Apr 2016 00:26:04 +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: If66eb29fae505d7a48ab9a735ce172f1c7894445
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:35 +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: Ifcd2757cab2394d06525e45e7521d7d03d039d82
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
Sharvil Nanavati [Thu, 21 Apr 2016 22:38:04 +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: I16efdb9d6cb0803526b7dfe93091801b85677445
Scott James Remnant [Thu, 21 Apr 2016 22:38:03 +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: Ib270f717adaeeab7a88bc9684a587687ac2b0933
Joshua Schwarz [Thu, 21 Apr 2016 22:38:03 +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: I9147f96afd47960134532639ed26f11e74887804
Devin Kim [Thu, 21 Apr 2016 22:38:02 +0000 (22:38 +0000)]
Fix BT connection failures am:
198abcd704 am:
e6fdbaf8a7
am:
d1414e5a0c
* commit '
d1414e5a0cafb8a0aa879e5abf6522a0067b8f7a':
Fix BT connection failures
Change-Id: I2bdded5dbce2d68ee39a92eff065281a7ef4941a
Alain Vongsouvanh [Thu, 21 Apr 2016 22:38:02 +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: Id87cb7652e437f43d1f95dcb30990af14a0e515b
Amadeusz Slawinski [Thu, 21 Apr 2016 22:38:01 +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: I66bb73fb96a430252e33a19940cc6408e8691642
Chris Elliott [Thu, 21 Apr 2016 22:38:00 +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: Id1a08140640791d82b52640de43395ccda9019de
Chris Elliott [Thu, 21 Apr 2016 22:38:00 +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: I343b77b8a4da7ca33975fc7b7d6dfade2dd3880e
Chris Elliott [Thu, 21 Apr 2016 22:37:59 +0000 (22:37 +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: I00e964c66de20fab64376dc24f8a114390d0d919
Zach Johnson [Thu, 21 Apr 2016 22:37:58 +0000 (22:37 +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: I7ed6180f5579700bc7c7fe99ae48ce1494d3c590
Sridhar Vashist [Thu, 21 Apr 2016 22:37:57 +0000 (22:37 +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: Icebc728b6e2807b65fb6ac1798414f5e96076db5
Sridhar Vashist [Thu, 21 Apr 2016 22:37:56 +0000 (22:37 +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: Ie2f818a257492b82d4e051ed9c7166d0ef26fc27
Chris Elliott [Thu, 21 Apr 2016 22:37:55 +0000 (22:37 +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: Ie8ea7e3c3079662129d4dd75c628d9681aa4183d
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
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: I477c6dc0e489ae79677e97a90405f0bb163a332c
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:40:01 +0000 (18:40 +0000)]
btif: add count of devices loaded on startup
am:
a042f8a022
* commit '
a042f8a02288e69154c405bbdf93c412a14da8bd':
btif: add count of devices loaded on startup
Change-Id: I42beae176a5a1ef5a2db4eb063d8ba54421c2af6
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
Jakub Pawlowski [Thu, 21 Apr 2016 15:49:40 +0000 (15:49 +0000)]
Cleanup unnecessary logs
am:
5be7c78326
* commit '
5be7c7832613abbd5c7a00d447e82c3a45a27e24':
Cleanup unnecessary logs
Change-Id: Ibcf54d81ba08ed439416bdf93b06da714128e8ba
Jakub Pawlowski [Tue, 12 Apr 2016 12:50:49 +0000 (05:50 -0700)]
Cleanup unnecessary logs
Bug:
27698756
Change-Id: I30b5e4b45d4b06e0264415e85949c7bf828f28c0
Ajay Panicker [Wed, 20 Apr 2016 00:52:04 +0000 (00:52 +0000)]
Add guest mode functionality (2/5)
am:
c7087d2466
* commit '
c7087d2466a291185853a6b2a16f789233e3420f':
Add guest mode functionality (2/5)
Change-Id: I30336af3fb0dff6cae93b18fbaf8ef87bdae1057
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
Sharvil Nanavati [Wed, 6 Apr 2016 21:46:49 +0000 (14:46 -0700)]
Delete unused JV code
Bug:
28068134
Change-Id: I16d017ef90269a435b8f66a58ed06d2fc89d407f
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:23:49 +0000 (20:23 +0000)]
Merge "Allow A2DP SNK audio track focus gain interface." into nyc-dev
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
AnubhavGupta [Tue, 22 Mar 2016 18:03:33 +0000 (23:33 +0530)]
AVRCP: Update sdp record correctly for CT or TG.
-Issuses: SDP records are faulty
- AVRCP versions are faulty
- Nexus configuration shows browsing supported
- Both Cat-1 and Cat-2 is supported for Nexus CT
-Solution
- pass sdp version as parameter
- update sdp records for avrcp controller in case of client
profiles being enabled
- BTA_AV_FEAT_BROWSE flag was incorrecly set during AV registration
causing AVRCP TG version to upgrade to 1.4 even though browsing
feature is not supported.
- Use AVRC_CTLR_INCLUDED feature flag instead of AVRC_ADV_CTRL_INCLUDED
for guarding Avrcp controller code in build/parse apis for
command/response
- update categories supported for CT properly for mobile phone config
Bug: b/
28149547
Change-Id: I3ff4082453a2624a72d8f152d75af83a8efb4937