OSDN Git Service
Jakub Pawlowski [Thu, 14 Jul 2016 18:05:39 +0000 (18:05 +0000)]
Update libchrome BUILD.gn am:
3ad44520b8 am:
e0e07d3643
am:
cd3db2c504
Change-Id: Id3c8390a0849d5594bc424cb1a3b04079a0aa757
Jakub Pawlowski [Thu, 14 Jul 2016 18:03:10 +0000 (18:03 +0000)]
Update libchrome BUILD.gn am:
3ad44520b8
am:
e0e07d3643
Change-Id: I1cdce6cf7bb81ae5bb40525c7e4f4472a5a8db1f
Jakub Pawlowski [Thu, 14 Jul 2016 17:59:40 +0000 (17:59 +0000)]
Update libchrome BUILD.gn
am:
3ad44520b8
Change-Id: If6e3c284c52fe8db1cbb61c7a41ec0024b5a696a
Jakub Pawlowski [Thu, 14 Jul 2016 11:53:30 +0000 (04:53 -0700)]
Update libchrome BUILD.gn
Update BUILD.gn to match libchrome from top of AOSP.
Change-Id: I1d8638d67f816479e58af627ab5bd00649b72697
Jakub Pawlowski [Tue, 12 Jul 2016 22:20:37 +0000 (22:20 +0000)]
Add OnConnectionStateChanged to IBluetoothGattServerCallback am:
7932727cbe am:
73ddfff34c
am:
36c2460569
Change-Id: I7ee35cf92763a12d183317dd4a134a29300c4a29
Jakub Pawlowski [Tue, 12 Jul 2016 22:17:17 +0000 (22:17 +0000)]
Add OnConnectionStateChanged to IBluetoothGattServerCallback am:
7932727cbe
am:
73ddfff34c
Change-Id: I18d613b85c8703cb012bf323f25034f9386a3934
Jakub Pawlowski [Tue, 12 Jul 2016 22:13:55 +0000 (22:13 +0000)]
Add OnConnectionStateChanged to IBluetoothGattServerCallback
am:
7932727cbe
Change-Id: I9edcca7deb2484d8b64c8f63872b4b08c9f4ecc6
Jakub Pawlowski [Thu, 7 Jul 2016 23:40:11 +0000 (16:40 -0700)]
Add OnConnectionStateChanged to IBluetoothGattServerCallback
Currently native GattServer clients can't tell wether someone connected
or disconnnected to the device. This patch fixed that, by exposing
OnConnectionStateChangedCallback
Bug:
29835693
Change-Id: Ia7ef592f4031d021ab1b45808126ca57f9348d0e
Ajay Panicker [Tue, 12 Jul 2016 20:00:47 +0000 (20:00 +0000)]
Add logs for AVRCP commands that originate from a remote device
am:
ecfeff6782
Change-Id: I270ce0a2fa20af67148e4260a4ff17e0a1ca956d
Ajay Panicker [Wed, 29 Jun 2016 23:39:07 +0000 (16:39 -0700)]
Add logs for AVRCP commands that originate from a remote device
Change-Id: I02b213913685d831bfe00e1938baef953428e048
Jacky Cheung [Tue, 12 Jul 2016 00:15:37 +0000 (00:15 +0000)]
New status code for two SMP authorization failures
am:
6984b19d95
Change-Id: I0a5261ba82166bfc25ac5e9d2d3583222fac6aa6
Jacky Cheung [Wed, 6 Jul 2016 22:11:30 +0000 (15:11 -0700)]
New status code for two SMP authorization failures
On BTA_DM_AUTH_SMP_UNKNOWN_ERR and BTA_DM_AUTH_SMP_CONN_TOUT, bond state
status will be notified as BT_STATUS_AUTH_FAILURE. This is observed during
the pairing flow with iOS devices.
Plus minor cleanup on SMP errors and fail reasons.
Bug:
29779689
Change-Id: Ia32fe6bb84b07272d5159409f65217a06a2e5f8e
Chih-Hung Hsieh [Fri, 8 Jul 2016 18:54:49 +0000 (18:54 +0000)]
Fix the implementation of macro BTM_IS_PUBLIC_BDA() am:
42e055353c am:
57c2f34ada
am:
b73c3ebcb0
Change-Id: I4436bc607e7186ea32435edc93981c121f257108
Chih-Hung Hsieh [Fri, 8 Jul 2016 18:50:59 +0000 (18:50 +0000)]
Fix the implementation of macro BTM_IS_PUBLIC_BDA() am:
42e055353c
am:
57c2f34ada
Change-Id: Ib43cd825a2dad5b72269cc05f62c77186ba204c4
Chih-Hung Hsieh [Fri, 8 Jul 2016 18:47:25 +0000 (18:47 +0000)]
Fix the implementation of macro BTM_IS_PUBLIC_BDA()
am:
42e055353c
Change-Id: I9273b46c7e11da04f93cd38383de697dcf3dc750
Chih-Hung Hsieh [Fri, 8 Jul 2016 17:29:55 +0000 (10:29 -0700)]
Fix the implementation of macro BTM_IS_PUBLIC_BDA()
Bug:
28705665
Change-Id: Id714a799c649ff85cf8bab9d8370626606fa7f2c
Andre Eisenbach [Fri, 8 Jul 2016 09:56:32 +0000 (09:56 +0000)]
Disable auto-pairing for hands-free devices
am:
21f534ba2a
Change-Id: I23c675875c28f1b5520cbe2c6c594453ec3f1ab1
Jacky Cheung [Fri, 8 Jul 2016 09:56:12 +0000 (09:56 +0000)]
Add BT_HCI_TIMEOUT and BT_CONFIG_SOURCE log events.
am:
b4a1f3abe2 -s ours
Change-Id: I044a79c37bcf08211d9064647aa30bab4c3c7189
Andre Eisenbach [Thu, 7 Jul 2016 23:17:14 +0000 (23:17 +0000)]
Disable auto-pairing for hands-free devices am:
43b12942ca am:
b70e8f6984
am:
960a893120
Change-Id: I156bea08470051f1c0d6d0eacae5acc7a043e12d
Andre Eisenbach [Thu, 7 Jul 2016 23:13:48 +0000 (23:13 +0000)]
Disable auto-pairing for hands-free devices am:
43b12942ca
am:
b70e8f6984
Change-Id: I556d5f3d076c906f35f5ea4b2b4d0837de48c8df
Andre Eisenbach [Thu, 7 Jul 2016 23:11:20 +0000 (23:11 +0000)]
Disable auto-pairing for hands-free devices
am:
43b12942ca
Change-Id: I1ca91fdcf1be9be6e1048123b79bf2eb4f44a60f
Andre Eisenbach [Thu, 7 Jul 2016 16:58:59 +0000 (09:58 -0700)]
Disable auto-pairing for hands-free devices
Fixes:
30004157
Change-Id: Id170856fbee5ea345f02f55d3a6e3376d846c2de
Andre Eisenbach [Thu, 7 Jul 2016 16:58:59 +0000 (09:58 -0700)]
Disable auto-pairing for hands-free devices
Fixes:
30004157
Change-Id: Id170856fbee5ea345f02f55d3a6e3376d846c2de
(cherry picked from commit
e8b81851c33095fe3b3ac78329073309be5421e1)
Jacky Cheung [Mon, 23 May 2016 19:39:01 +0000 (12:39 -0700)]
Add BT_HCI_TIMEOUT and BT_CONFIG_SOURCE log events.
These events are used to track HCI timeout and configuration file
usage respectively.
Change-Id: I5c8b6ef20b61f03b9ccb74f3b1c9784e4653b770
Jacky Cheung [Wed, 6 Jul 2016 18:54:30 +0000 (18:54 +0000)]
SMP: Delay authorization complete.
am:
29e70e38ac
Change-Id: I2d836f9ebd20fb626e470450940e9c92f78e1ed3
Jakub Pawlowski [Sat, 2 Jul 2016 01:44:05 +0000 (01:44 +0000)]
Add callbacks to GATT read/write operation am:
24ea892320 am:
be30d36444
am:
8c3a94a918
Change-Id: I9f5a2e19fb6071662b10e79568520088bb5b4bbb
Jakub Pawlowski [Sat, 2 Jul 2016 01:41:34 +0000 (01:41 +0000)]
Add callbacks to GATT read/write operation am:
24ea892320
am:
be30d36444
Change-Id: Ic7e4b11a1224917d93a2bbac9a00af8d4a9b57c9
Jakub Pawlowski [Sat, 2 Jul 2016 01:39:08 +0000 (01:39 +0000)]
Add callbacks to GATT read/write operation
am:
24ea892320
Change-Id: I49b30d782f1260f63a75a4006c61b9ecc0f23d76
Jakub Pawlowski [Fri, 13 May 2016 23:39:25 +0000 (16:39 -0700)]
Add callbacks to GATT read/write operation
There is no need for read/write callback to be a global event. It should
execute local callback instead.
Change-Id: Id7e915af9d30092d2f754eddc7c3aed4970eeb2f
Jacky Cheung [Tue, 17 May 2016 20:42:43 +0000 (13:42 -0700)]
SMP: Delay authorization complete.
Delay authorization complete during Bond Pending state in SMP.
Instead of automatically advancing the Bond Pending state, create
a 500ms window to allow the slave to stop pairing by sending over
the Pairing Failed command during the Bond Pending state.
BUG:
28475887
Change-Id: Id6c30247d15258cd18eb34827694b6cd79ca753a
Ajay Panicker [Fri, 1 Jul 2016 23:28:03 +0000 (23:28 +0000)]
Add logs for AVRCP commands that originate from a remote device am:
da34e5b65e am:
d052802592
am:
b37ad8f6f9
Change-Id: If8e4f48aac5ba59abd7390f187deae7fe07e4c0e
Ajay Panicker [Fri, 1 Jul 2016 23:24:51 +0000 (23:24 +0000)]
Add logs for AVRCP commands that originate from a remote device am:
da34e5b65e
am:
d052802592
Change-Id: Ie7450b4ccde398d1a54bb2384d729236017fe316
Ajay Panicker [Fri, 1 Jul 2016 23:22:30 +0000 (23:22 +0000)]
Add logs for AVRCP commands that originate from a remote device
am:
da34e5b65e
Change-Id: Ia29f28b3bb71da2b1f1beec72dad059fa9febf3f
Ajay Panicker [Wed, 29 Jun 2016 23:39:07 +0000 (16:39 -0700)]
Add logs for AVRCP commands that originate from a remote device
Change-Id: I02b213913685d831bfe00e1938baef953428e048
Jacky Cheung [Fri, 1 Jul 2016 20:38:01 +0000 (20:38 +0000)]
Merge \\\"SMP: Delay authorization complete.\\\" am:
8afa82d0c3 am:
305d82783d
am:
513a5b35a0
Change-Id: I4bc1bfd71f8cc87805c4a7d3cd645c1335abb2e0
Jacky Cheung [Fri, 1 Jul 2016 20:33:00 +0000 (20:33 +0000)]
Merge \\"SMP: Delay authorization complete.\\" am:
8afa82d0c3
am:
305d82783d
Change-Id: I5311f1b589b20d989ba280f36fccf3d793a1f2fd
Jacky Cheung [Fri, 1 Jul 2016 20:27:44 +0000 (20:27 +0000)]
Merge \"SMP: Delay authorization complete.\"
am:
8afa82d0c3
Change-Id: Iade6d0379d44b26c6b2b401985c09e16916915d4
Jacky Cheung [Fri, 1 Jul 2016 20:23:35 +0000 (20:23 +0000)]
Merge "SMP: Delay authorization complete."
Chih-Hung Hsieh [Fri, 1 Jul 2016 00:06:03 +0000 (00:06 +0000)]
Fix google-explicit-constructor warnings in system/bt. am:
3398730eac am:
7dab90e0b2
am:
eca5660fc4
Change-Id: I240d8bd71482e0ee98d01af7cfc56830320fb1c0
Chih-Hung Hsieh [Fri, 1 Jul 2016 00:02:02 +0000 (00:02 +0000)]
Fix google-explicit-constructor warnings in system/bt. am:
3398730eac
am:
7dab90e0b2
Change-Id: I47a99c185fac42807aa33c737fb66c113983c2d4
Chih-Hung Hsieh [Thu, 30 Jun 2016 23:57:54 +0000 (23:57 +0000)]
Fix google-explicit-constructor warnings in system/bt.
am:
3398730eac
Change-Id: I54f2a53f6a2a6bf3ceb524966d98e2c1c80a58a3
Chih-Hung Hsieh [Thu, 30 Jun 2016 22:45:24 +0000 (15:45 -0700)]
Fix google-explicit-constructor warnings in system/bt.
* Declare conversion constructors as 'explicit'.
* Add NOLINT to implicit converters.
Bug:
28341362
Change-Id: I81fecf19c0ee2e64dd6778b3dea78e04f111bfb4
Test: build with clang-tidy
Andre Eisenbach [Thu, 30 Jun 2016 00:27:51 +0000 (00:27 +0000)]
Log RSSI when A2DP buffers are flushed am:
741c1b4cc9 am:
b29a4b26f9
am:
4e3932f46f
Change-Id: Iaf3634f8b3d20fd9c21273c662606f5e94ae893a
Andre Eisenbach [Thu, 30 Jun 2016 00:25:32 +0000 (00:25 +0000)]
Log RSSI when A2DP buffers are flushed am:
741c1b4cc9
am:
b29a4b26f9
Change-Id: I4b83c82142182d0bf82b09627d8fb18bab4c3c37
Andre Eisenbach [Thu, 30 Jun 2016 00:22:37 +0000 (00:22 +0000)]
Log RSSI when A2DP buffers are flushed
am:
741c1b4cc9
Change-Id: I4dc09a22922650dbeef7e3a254cc1f571419113c
Andre Eisenbach [Wed, 29 Jun 2016 23:18:46 +0000 (23:18 +0000)]
A2DP media task: Flush full TX queue on congestion am:
de3505fc6c am:
79687efb34
am:
239c3c3d0b
Change-Id: If803f921503a640a075bc3dd552a55ceff8dc8a9
Andre Eisenbach [Wed, 29 Jun 2016 23:16:24 +0000 (23:16 +0000)]
A2DP media task: Flush full TX queue on congestion am:
de3505fc6c
am:
79687efb34
Change-Id: I0eb175c6c6e1afd772f21d4a9ff3d9447c73bbfd
Andre Eisenbach [Wed, 29 Jun 2016 23:14:06 +0000 (23:14 +0000)]
A2DP media task: Flush full TX queue on congestion
am:
de3505fc6c
Change-Id: I82ed74baec551c7e3c1535eddb223c21a471d8c6
Andre Eisenbach [Wed, 29 Jun 2016 19:46:13 +0000 (12:46 -0700)]
Log RSSI when A2DP buffers are flushed
To add another datapoint and potentially narrow down *why* we had to
flush the buffers, add RSSI logging to keep track of signal strength
during audio drop-out events.
Change-Id: Ie52f56290951130165a9f375a898a9bacf459d55
Andre Eisenbach [Thu, 23 Jun 2016 23:14:53 +0000 (16:14 -0700)]
A2DP media task: Flush full TX queue on congestion
Currently, our TX queue does not allow for quick recovery of minor
congestion. As we only clear as much room in the queue as is needed to
fix the news frames needed for a given timer tick, any minor congestion
on the TX path can result in single frames to be dropped over an
excessively long amount of time.
From the "just rip the band-aid off" school of thought, drop the whole
queue instead to cause a single drop-out on congestion and catch up to
the live stream immediately, hoping that the stream recovers...
Bug:
29601962
Change-Id: I482c3cfef6d8b51143e54733eb2da5f70663636f
(cherry picked from commit
d881c4b46776fe03a5861a3021bbe739b1f3cc58)
Andre Eisenbach [Wed, 29 Jun 2016 23:07:04 +0000 (23:07 +0000)]
Log RSSI when A2DP buffers are flushed
am:
ade5776f2b
Change-Id: I67e03338c89d134c350915e60b432b442db9304e
Jacky Cheung [Tue, 17 May 2016 20:42:43 +0000 (13:42 -0700)]
SMP: Delay authorization complete.
Delay authorization complete during Bond Pending state in SMP.
Instead of automatically advancing the Bond Pending state, create
a 500ms window to allow the slave to stop pairing by sending over
the Pairing Failed command during the Bond Pending state.
BUG:
28475887
Change-Id: Ie59ff23128b5d523aa13c4db599be97396097cc3
Andre Eisenbach [Wed, 29 Jun 2016 19:46:13 +0000 (12:46 -0700)]
Log RSSI when A2DP buffers are flushed
To add another datapoint and potentially narrow down *why* we had to
flush the buffers, add RSSI logging to keep track of signal strength
during audio drop-out events.
Change-Id: Ie52f56290951130165a9f375a898a9bacf459d55
Jacky Cheung [Wed, 29 Jun 2016 01:20:13 +0000 (01:20 +0000)]
Add BT_HCI_TIMEOUT and BT_CONFIG_SOURCE log events. am:
e909ff50ff am:
36edfe11a9
am:
1299933ed2
Change-Id: I615be3567584736a7d6d0fa441daff33ed965996
Jacky Cheung [Wed, 29 Jun 2016 01:17:36 +0000 (01:17 +0000)]
Add BT_HCI_TIMEOUT and BT_CONFIG_SOURCE log events. am:
e909ff50ff
am:
36edfe11a9
Change-Id: I8cbe3a94dd655ecbb785698b9447a77f0f111b94
Jacky Cheung [Wed, 29 Jun 2016 01:15:04 +0000 (01:15 +0000)]
Add BT_HCI_TIMEOUT and BT_CONFIG_SOURCE log events.
am:
e909ff50ff
Change-Id: Iafd1759f79364e80101344f5023726feb146ff53
Jacky Cheung [Mon, 23 May 2016 19:39:01 +0000 (12:39 -0700)]
Add BT_HCI_TIMEOUT and BT_CONFIG_SOURCE log events.
These events are used to track HCI timeout and configuration file
usage respectively.
Change-Id: I5c8b6ef20b61f03b9ccb74f3b1c9784e4653b770
Jakub Pawlowski [Tue, 28 Jun 2016 19:06:03 +0000 (19:06 +0000)]
Simplify GATT characteristic read memory handling am:
3c5451da9d am:
66d4b35055
am:
c6f0b0945a
Change-Id: I9634855ef04617eb10667c88319967123f6f1b24
Jakub Pawlowski [Tue, 28 Jun 2016 19:03:36 +0000 (19:03 +0000)]
Simplify GATT characteristic read memory handling am:
3c5451da9d
am:
66d4b35055
Change-Id: Ie8ee541b0edfd80728f1e1503a21fbed63877f29
Jakub Pawlowski [Tue, 28 Jun 2016 19:01:08 +0000 (19:01 +0000)]
Simplify GATT characteristic read memory handling
am:
3c5451da9d
Change-Id: I988d7eefcb9a0856ef61496610eac26b29aefa7d
Jakub Pawlowski [Sat, 25 Jun 2016 00:06:41 +0000 (17:06 -0700)]
Simplify GATT characteristic read memory handling
Pass read result in a fixed sized array instead of a pointer.
This eliminates the need for any special memory management in btif.
Change-Id: I2a33d74b12f3059050855c9fc90fff785cc985ba
Andre Eisenbach [Tue, 28 Jun 2016 00:04:29 +0000 (00:04 +0000)]
Add Subaru and Nissan car kits to auto pair blacklist am:
d13870072e
am:
282bb6fc22
Change-Id: Iabc36d985997a131ed36b20f594a6d0a39613784
Andre Eisenbach [Tue, 28 Jun 2016 00:04:16 +0000 (00:04 +0000)]
Add Subaru and Nissan car kits to auto pair blacklist am:
d13870072e
am:
290c92a3ea
Change-Id: Ibfe13019cccf7fc01a5c4a6cf482aee7b44da1d6
Andre Eisenbach [Mon, 27 Jun 2016 23:53:23 +0000 (23:53 +0000)]
Add Subaru and Nissan car kits to auto pair blacklist
am:
d13870072e
Change-Id: I753967a57a3e460638ab904ad987beda96399975
Andre Eisenbach [Mon, 27 Jun 2016 23:53:22 +0000 (23:53 +0000)]
Add Subaru and Nissan car kits to auto pair blacklist
am:
d13870072e
Change-Id: Iff3e3643f4cc36c093e5a7d0d47af8e3aa79fe9c
Andy Hung [Mon, 27 Jun 2016 23:33:05 +0000 (23:33 +0000)]
Match socket buffer sizes between audio HAL and BT server am:
3d02215979 am:
753ef725b9
am:
5cf328fca2
Change-Id: Ifd200a7004cc47dcb95eed476acc34b166aa92e7
Andy Hung [Mon, 27 Jun 2016 23:30:03 +0000 (23:30 +0000)]
Match socket buffer sizes between audio HAL and BT server am:
3d02215979
am:
753ef725b9
Change-Id: Ibb2fd3f2ac5b07c61f03f5fd8b649f22ca48b688
Andy Hung [Mon, 27 Jun 2016 23:24:38 +0000 (23:24 +0000)]
Match socket buffer sizes between audio HAL and BT server
am:
3d02215979
Change-Id: Id4e09877ebba3a3096bde0a59e8c4c5dc7a26051
Andre Eisenbach [Mon, 27 Jun 2016 22:49:53 +0000 (15:49 -0700)]
Add Subaru and Nissan car kits to auto pair blacklist
Bug:
29157087
Change-Id: If227963b939a9b0ed55e6d900364c71932d3cfe8
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
(cherry picked from commit
e97d975cce213b8c6e4f69bc3fc75411a1743647)
Andre Eisenbach [Sat, 25 Jun 2016 00:00:26 +0000 (00:00 +0000)]
A2DP media task: Flush full TX queue on congestion am:
d881c4b467
am:
16e874b6a2
Change-Id: I4b5f913cc2021246eb985342605a89a2dd50cd0a
Andre Eisenbach [Fri, 24 Jun 2016 23:57:04 +0000 (23:57 +0000)]
A2DP media task: Flush full TX queue on congestion am:
d881c4b467
am:
1a1fc4959e
Change-Id: Ia12236c41326878e38380bde805c084bc52cff3f
Andre Eisenbach [Fri, 24 Jun 2016 23:54:36 +0000 (23:54 +0000)]
A2DP media task: Flush full TX queue on congestion
am:
d881c4b467
Change-Id: Ie00432fcec7e869c212a04374d6fcd58094eb643
Andre Eisenbach [Fri, 24 Jun 2016 23:54:36 +0000 (23:54 +0000)]
A2DP media task: Flush full TX queue on congestion
am:
d881c4b467
Change-Id: I4e15610487705635ece8fb6bd727c320dfaacd7a
Andre Eisenbach [Thu, 23 Jun 2016 23:14:53 +0000 (16:14 -0700)]
A2DP media task: Flush full TX queue on congestion
Currently, our TX queue does not allow for quick recovery of minor
congestion. As we only clear as much room in the queue as is needed to
fix the news frames needed for a given timer tick, any minor congestion
on the TX path can result in single frames to be dropped over an
excessively long amount of time.
From the "just rip the band-aid off" school of thought, drop the whole
queue instead to cause a single drop-out on congestion and catch up to
the live stream immediately, hoping that the stream recovers...
Bug:
29601962
Change-Id: I482c3cfef6d8b51143e54733eb2da5f70663636f
Jakub Pawlowski [Fri, 24 Jun 2016 22:58:57 +0000 (22:58 +0000)]
Get rid of unused BTA_DYNAMIC_MEMORY am:
25984b0d22 am:
88eb96fd30
am:
da1ed5a725
Change-Id: I6f1ba89dc4a7e9c15c3264da10582f4b0e01d78a
Jakub Pawlowski [Fri, 24 Jun 2016 22:56:10 +0000 (22:56 +0000)]
Get rid of unused BTA_DYNAMIC_MEMORY am:
25984b0d22
am:
88eb96fd30
Change-Id: Idcbb1232a2fbd1b253ad9d5daeea990ff21dea3c
Jakub Pawlowski [Fri, 24 Jun 2016 22:54:19 +0000 (22:54 +0000)]
Get rid of unused BTA_DYNAMIC_MEMORY
am:
25984b0d22
Change-Id: I182b5b707f6537c8c50cb5cac794ecedebc45b4d
Andre Eisenbach [Fri, 24 Jun 2016 21:59:08 +0000 (21:59 +0000)]
Merge \\"Remove SBC frame scrambling\\" into nyc-dev am:
6b142ed4b5
am:
c0fe249846
Change-Id: I00db4b4f3a128ea9806bad0aeb73a7102bf9bb76
Andre Eisenbach [Fri, 24 Jun 2016 21:56:38 +0000 (21:56 +0000)]
resolve merge conflicts of
6b142ed to nyc-dev-plus-aosp
am:
fa0ca05540
Change-Id: I3d18778d8263e6409db0e72697719e7339ac485c
Andre Eisenbach [Fri, 24 Jun 2016 21:53:22 +0000 (14:53 -0700)]
resolve merge conflicts of
6b142ed to nyc-dev-plus-aosp
Change-Id: I222ff056f7ba91903a60f1ef6958b6e4ec6f7f79
Jakub Pawlowski [Fri, 24 Jun 2016 21:41:53 +0000 (21:41 +0000)]
Use bta_gattc_cb directly, not through aliases am:
a05734c69c am:
de22f90d28
am:
b4abd79954
Change-Id: I1dba256438b61c564f7dd2e9ddba5cda7d2a8d64
Jakub Pawlowski [Fri, 24 Jun 2016 21:39:28 +0000 (21:39 +0000)]
Use bta_gattc_cb directly, not through aliases am:
a05734c69c
am:
de22f90d28
Change-Id: I210d6bdb64a073a61c82420bb995cec88d1e2ccf
Jakub Pawlowski [Fri, 24 Jun 2016 21:37:32 +0000 (21:37 +0000)]
Use bta_gattc_cb directly, not through aliases
am:
a05734c69c
Change-Id: Iefcdc6e3ea4504e859464e778e6ca88222fc379b
Andre Eisenbach [Fri, 24 Jun 2016 21:17:28 +0000 (21:17 +0000)]
Remove log spam in btif_gattc_update_properties am:
ffdb33b5fc -s ours
am:
2cfe6349eb
Change-Id: Ia531ffc87f30b0e87c820a52db0e1cc32f1acf59
Andre Eisenbach [Fri, 24 Jun 2016 21:15:01 +0000 (21:15 +0000)]
Remove log spam in btif_gattc_update_properties
am:
ffdb33b5fc -s ours
Change-Id: I4ec69857999b0d7c89596a02386f796f50388ba7
Andre Eisenbach [Fri, 24 Jun 2016 21:15:01 +0000 (21:15 +0000)]
Remove log spam in btif_gattc_update_properties am:
ffdb33b5fc
am:
b97a1599e7 -s ours
Change-Id: Ib7b5771b1caae14085ff4d53e83e06ade102224a
Jakub Pawlowski [Fri, 24 Jun 2016 21:05:58 +0000 (14:05 -0700)]
Get rid of unused BTA_DYNAMIC_MEMORY
Change-Id: Idc7fcddfecac9ab7d9800b496e2380ae277f357f
Jakub Pawlowski [Fri, 24 Jun 2016 20:36:01 +0000 (13:36 -0700)]
Use bta_gattc_cb directly, not through aliases
Right now, bta_gattc_cb is not used directly, instead it's passed as
argument to methods that can use it directly.
Change-Id: I54fef4b8b1e11b3289e7961f70bea187173e9804
Andre Eisenbach [Fri, 24 Jun 2016 17:31:36 +0000 (17:31 +0000)]
Merge \"Remove SBC frame scrambling\" into nyc-dev
am:
6b142ed4b5
Change-Id: I7dd99e2af5ec4b09a9cba9830df9cf0c677ca46b
Andre Eisenbach [Fri, 24 Jun 2016 17:31:35 +0000 (17:31 +0000)]
Remove log spam in btif_gattc_update_properties
am:
ffdb33b5fc
Change-Id: I1df2268b7ddd28220f69d4eeeaee30097a976e7c
Andre Eisenbach [Fri, 24 Jun 2016 17:16:52 +0000 (17:16 +0000)]
Merge "Remove SBC frame scrambling" into nyc-dev
Andre Eisenbach [Thu, 23 Jun 2016 22:25:44 +0000 (15:25 -0700)]
Remove SBC frame scrambling
Bug:
29601962
Change-Id: I30ce09f1c7550a1be9fd1c8ed70745f9aa0cdb44
Andre Eisenbach [Thu, 23 Jun 2016 21:22:35 +0000 (14:22 -0700)]
Remove log spam in btif_gattc_update_properties
Bug:
29601962
Change-Id: I4a86b786609b0203a72b750a1c4a38c82fcc5f97
Marie Janssen [Wed, 22 Jun 2016 22:53:46 +0000 (22:53 +0000)]
resolve merge conflicts of
b7f64bc to stage-aosp-master am:
649e13fbfb
am:
bd0d8060e0
Change-Id: Ia81d2fb7453f58e4bbae8a923821d109f4aa47ca
Marie Janssen [Wed, 22 Jun 2016 22:39:47 +0000 (22:39 +0000)]
resolve merge conflicts of
b7f64bc to stage-aosp-master
am:
649e13fbfb
Change-Id: I74fb93559793619a604f7ab442b0274ed3e3fd27
Marie Janssen [Wed, 22 Jun 2016 22:24:37 +0000 (15:24 -0700)]
resolve merge conflicts of
b7f64bc to stage-aosp-master
Change-Id: I8359cd1895d6a0e49e834a8f45823865617a207d
Marie Janssen [Wed, 22 Jun 2016 19:52:19 +0000 (12:52 -0700)]
btif: standardize types, #ifs
Use standard types everywhere.
Use standard style for #if statements:
- #if (VAR_NAME == TRUE)
- #if (VAR_NAME1 == TRUE && VAR_NAME2 == TRUE)
Use __func__ instead of __FUNCTION__
Change-Id: Ic29d1d0b32c3ca9953752a4e5da6c28f45ec8895
Sharvil Nanavati [Wed, 22 Jun 2016 01:32:48 +0000 (01:32 +0000)]
resolve merge conflicts of
1f433cb to mnc-dr-dev am:
f15ca6d21d -s ours am:
8e80a26078 am:
edb7ce120e am:
c4bc5d2c5a
am:
2a86cae3e3
Change-Id: I36c28421ac5b57af30507c486c804f241da76167
Sharvil Nanavati [Wed, 22 Jun 2016 01:31:04 +0000 (01:31 +0000)]
resolve merge conflicts of
1f433cb to mnc-dr-dev am:
f15ca6d21d -s ours am:
8e80a26078 am:
edb7ce120e am:
c4bc5d2c5a
am:
d395be3fc5
Change-Id: I3ff54fa4ffe471bc0c68422f08163494f6f97ec2
OSDN Git Service
