OSDN Git Service
Jack He [Sat, 10 Feb 2018 00:19:57 +0000 (00:19 +0000)]
Merge "A2DP: Construct BtWorkerThread's message loop on designated thread" am:
199bf77055
am:
fcc5b66613
Change-Id: I00b966c573f3f65407c18b49431e875aebb5caeb
Jack He [Sat, 10 Feb 2018 00:03:21 +0000 (00:03 +0000)]
Merge "A2DP: Construct BtWorkerThread's message loop on designated thread"
am:
199bf77055
Change-Id: Iada4a606411d0811bc60b3fc2cd63ef54e2bcb16
Treehugger Robot [Fri, 9 Feb 2018 22:14:27 +0000 (22:14 +0000)]
Merge "A2DP: Construct BtWorkerThread's message loop on designated thread"
Ajay Panicker [Fri, 9 Feb 2018 21:31:28 +0000 (21:31 +0000)]
AVRCP: Check the number of text value attributes requested am:
6313da35ab am:
c04bf30f51
am:
d7cf66d304
Change-Id: Ie634bcf3ee63bc332eb25c26eca734384832673e
Ajay Panicker [Fri, 9 Feb 2018 21:18:18 +0000 (21:18 +0000)]
AVRCP: Check the number of text value attributes requested am:
6313da35ab
am:
c04bf30f51
Change-Id: Ibe9bb37ea975224c7090589e43f25a9455778013
Ajay Panicker [Fri, 9 Feb 2018 21:12:13 +0000 (21:12 +0000)]
AVRCP: Check the number of text value attributes requested
am:
6313da35ab
Change-Id: I7014801c4e9c358f198066aa05b9517cec5526ef
Jack He [Thu, 8 Feb 2018 01:33:16 +0000 (17:33 -0800)]
A2DP: Construct BtWorkerThread's message loop on designated thread
* Moves BtWorkerThread's message_loop_'s construction to the
Run() method run by the designated message_loop_thread_ so that
message_loop_'s construction and execution are on the same thread
* Makes BtWorkerThread::StartUp() blocking until message_loop_
starts running using std:condition_variable
* Modify BtWorkerThread::DoInThread() to return boolean
Detail:
Before this CL, BtWorkerThread.message_loop_ is created on Java main
thread and run on message_loop_thread_. During clean-up, A2DP shutdown
message_loop_thread_, rendering the posted_from field in current_pending_task_
invalid. However, although the runner thread is killed, the owner
thread, the Java main thread, is still active. Therefore, we we try to
PostTask() from Java main thread after message_loop_thread_ is killed,
we will try to access an invalid Location object. This results in a
SEGV_MAPPER SEGFAULT. Thus, the fix would be creating and running the
message loop on the same thread so that Java main thread won't have an
invalid message loop after the worker thread is killed.
This can be detected earlier through adding "-DDCHECK_ALWAYS_ON" in both
libchrome and libbluetooth and libchrome will validate the thread for
us.
Fixes:
72831931
Test: Test with DCHECK_ALWAYS_ON in both libbluetooth and libchrome
ProfileServiceTest stress tests
Change-Id: I7b196b8c1113c2758c2b82ddf4d13c46352bb620
Stanley Tng [Fri, 9 Feb 2018 04:40:58 +0000 (04:40 +0000)]
Merge "Prevent spurious connect failures callback" am:
29ff71470e
am:
2cbbfd1fdb
Change-Id: If2312e34e3202755071d1eea8c140349eee79a89
Stanley Tng [Fri, 9 Feb 2018 04:35:55 +0000 (04:35 +0000)]
Merge "Prevent spurious connect failures callback"
am:
29ff71470e
Change-Id: If8b053eaf419f3f44fcb8877f1e0a49f028d43cf
Treehugger Robot [Fri, 9 Feb 2018 04:19:31 +0000 (04:19 +0000)]
Merge "Prevent spurious connect failures callback"
Ajay Panicker [Thu, 11 Jan 2018 00:58:16 +0000 (16:58 -0800)]
AVRCP: Check the number of text value attributes requested
Test: Builds
Bug:
69479009
Change-Id: I184ddfdb56c15c2b07d52a2624240738efb4d207
Jakub Pawlowski [Thu, 8 Feb 2018 20:48:47 +0000 (20:48 +0000)]
btif_rc - make set_volume easier to comprehend am:
884314c1d9
am:
0b21d9f3d7
Change-Id: I119be24e8e98eeb7d5a421f002aea38cc399800a
Jakub Pawlowski [Thu, 8 Feb 2018 20:44:14 +0000 (20:44 +0000)]
btif_rc - make set_volume easier to comprehend
am:
884314c1d9
Change-Id: I71e44ac5ba5bd2762228a87bb6c61c5fb5f824d9
Jakub Pawlowski [Thu, 8 Feb 2018 18:26:35 +0000 (10:26 -0800)]
btif_rc - make set_volume easier to comprehend
Test: compilation
Change-Id: I73c01cb5e3a2da1cdb9acc3b7fe3114f4af7373e
Stanley Tng [Thu, 8 Feb 2018 01:59:04 +0000 (17:59 -0800)]
Prevent spurious connect failures callback
Send connection failures only if the event's mac address matches the
currently bonding device.
Test: Run SL4A "BleCocTest:test_coc_secured_connection_throughput"
Bug:
71364658
Change-Id: I64243996ae37dd376ed36363a7d749b4b5ab36b2
Jakub Pawlowski [Thu, 8 Feb 2018 05:18:19 +0000 (05:18 +0000)]
Merge "Make sure task_runner is valid when we call PostTask on it" am:
c0df1edbf1
am:
5bd60e7aa0
Change-Id: I1d22115c5efdef27ad53204cb99f6b50b9e77a46
Jakub Pawlowski [Thu, 8 Feb 2018 05:11:33 +0000 (05:11 +0000)]
Merge "Make sure task_runner is valid when we call PostTask on it"
am:
c0df1edbf1
Change-Id: Ic38745138958a7e9c5d58a6e81742deb101c5d43
Treehugger Robot [Thu, 8 Feb 2018 05:02:48 +0000 (05:02 +0000)]
Merge "Make sure task_runner is valid when we call PostTask on it"
Jakub Pawlowski [Thu, 8 Feb 2018 02:54:36 +0000 (02:54 +0000)]
Call BTA_GATTS_AddService on correct thread am:
541862ce72
am:
83fd93fd4a
Change-Id: Ib4b1354fdc585684349e7758e7966b0badf3d583
Jakub Pawlowski [Thu, 8 Feb 2018 02:29:01 +0000 (02:29 +0000)]
Call BTA_GATTS_AddService on correct thread
am:
541862ce72
Change-Id: I40487af3885e01b95fddb9f8260992e5995c11b2
Myles Watson [Wed, 7 Feb 2018 22:41:12 +0000 (22:41 +0000)]
Merge "Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into cw-f-dev am:
836d07dd77" into nyc-mr2-dev am:
206be7e884 am:
6bb62e44cb am:
06c43778c6
am:
ceb758d959
Change-Id: Icb5295dc24e4ed0c3df34e583bdff133d4bf85e7
Myles Watson [Wed, 7 Feb 2018 22:34:32 +0000 (22:34 +0000)]
Merge changes from topic "am-
e4209b1fdb924afeb6b600eabca4a64d" into oc-dev am:
168f4e7d99 am:
b075bbc371
am:
4ec7f61139
Change-Id: I58fa5fa2ce5f6f6c3dd11b23673bc1b3ad49cf3c
Myles Watson [Wed, 7 Feb 2018 22:34:00 +0000 (22:34 +0000)]
[automerger] Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr1-dev am:
c6f379e4f2 am:
9cbe0a31a3 am:
c83a890ca2 am:
4784e0f9f5 am:
47b70de56d
am:
d3d6018534
Change-Id: I49d869dec13201dd9e56cd77ba66859e4cd8c993
Myles Watson [Wed, 7 Feb 2018 22:19:37 +0000 (22:19 +0000)]
Merge "Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into cw-f-dev am:
836d07dd77" into nyc-mr2-dev am:
206be7e884 am:
6bb62e44cb
am:
06c43778c6
Change-Id: Icfebf1a863e7c98bde5f0ca2cf768f89ffcf6123
Myles Watson [Wed, 7 Feb 2018 22:17:00 +0000 (22:17 +0000)]
Merge changes from topic "am-
e4209b1fdb924afeb6b600eabca4a64d" into oc-dev am:
168f4e7d99
am:
b075bbc371
Change-Id: I01c2dd36bacbd99d69ee7a24dc357fb7562e978b
Myles Watson [Wed, 7 Feb 2018 22:16:30 +0000 (22:16 +0000)]
[automerger] Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr1-dev am:
c6f379e4f2 am:
9cbe0a31a3 am:
c83a890ca2 am:
4784e0f9f5
am:
47b70de56d
Change-Id: Ieae594143d0d715e7abba5e43d2713732edd2bda
Myles Watson [Wed, 7 Feb 2018 22:05:00 +0000 (22:05 +0000)]
Merge "Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into cw-f-dev am:
836d07dd77" into nyc-mr2-dev am:
206be7e884
am:
6bb62e44cb
Change-Id: Iab9402f0e133b59728269f28ee85003f96c35997
Myles Watson [Wed, 7 Feb 2018 22:02:19 +0000 (22:02 +0000)]
Merge changes from topic "am-
e4209b1fdb924afeb6b600eabca4a64d" into oc-dev
am:
168f4e7d99
Change-Id: I0001203b9de92b9dbe635fda8b1fd520f559f73c
Myles Watson [Wed, 7 Feb 2018 22:01:39 +0000 (22:01 +0000)]
[automerger] Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr1-dev am:
c6f379e4f2 am:
9cbe0a31a3 am:
c83a890ca2
am:
4784e0f9f5
Change-Id: Id46910eb6b40977461b4ac0148f2f1de24ce1645
Myles Watson [Wed, 7 Feb 2018 21:57:22 +0000 (21:57 +0000)]
Merge "Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into cw-f-dev am:
09c96fcc30" into nyc-mr2-dev am:
83f0c05bcb am:
02fe8680a0 am:
113b7d796e
am:
914ca8f50b
Change-Id: I05b4f117325a98ed011aff62d11adbdc42e60588
Myles Watson [Wed, 7 Feb 2018 21:56:52 +0000 (21:56 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr2-dev am:
e285901834 am:
a910b735ca am:
3253d77401
am:
4379344a01
Change-Id: Ic8cac997b5b17276df32ee23ce0d6067304ce6dd
Myles Watson [Wed, 7 Feb 2018 21:56:20 +0000 (21:56 +0000)]
Merge changes from topic "am-
a3017cc6c28740f4a52f9ef5d5b9be0e" into oc-dev am:
d936f1f22f am:
e6f7fd7edd
am:
4744896602
Change-Id: Ie30e7cb144e786bc2996fa876d85de2902b11747
Myles Watson [Wed, 7 Feb 2018 21:55:35 +0000 (21:55 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into oc-dev am:
50154c463a am:
ba2c15b8c2
am:
e97694d7c9
Change-Id: I3230299d5bea33960fd95fc74173e7c4efeaa9ab
Myles Watson [Wed, 7 Feb 2018 21:54:33 +0000 (21:54 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-dr1-dev am:
c1f1c627c8 am:
7bed084759 am:
af3f55e2e2 am:
58b9373cc5 am:
0544dc9d0d am:
a3292e76a4
am:
6a58488cf3
Change-Id: I9745438e04d8ed015e773788e3a23260826b4873
Myles Watson [Wed, 7 Feb 2018 21:51:49 +0000 (21:51 +0000)]
Merge "Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into cw-f-dev am:
09c96fcc30" into nyc-mr2-dev am:
83f0c05bcb am:
02fe8680a0
am:
113b7d796e
Change-Id: I31e3d8e8c5eed0ab992c443a8beb9eeb41866218
Myles Watson [Wed, 7 Feb 2018 21:51:02 +0000 (21:51 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr2-dev am:
e285901834 am:
a910b735ca
am:
3253d77401
Change-Id: Iab5af3febaef2c0868d33aa5174ed7d84d6486f1
Myles Watson [Wed, 7 Feb 2018 21:50:35 +0000 (21:50 +0000)]
Merge changes from topic "am-
a3017cc6c28740f4a52f9ef5d5b9be0e" into oc-dev am:
d936f1f22f
am:
e6f7fd7edd
Change-Id: I6bf5b9b85b761c3a0ddaa1f80d5e40aa8d9d457a
Myles Watson [Wed, 7 Feb 2018 21:50:05 +0000 (21:50 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into oc-dev am:
50154c463a
am:
ba2c15b8c2
Change-Id: I95a60d89ad6af95e2d6b375c9d2c10274d172972
Myles Watson [Wed, 7 Feb 2018 21:49:35 +0000 (21:49 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-mr1-dev am:
5666c37ad1 am:
dfef16ff78 am:
9cd44cac30 am:
136f030d24 am:
ab42c06260
am:
afd761681e
Change-Id: I344927cd788ff783d09fd7039b29d6881fbceec5
Myles Watson [Wed, 7 Feb 2018 21:49:32 +0000 (21:49 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-dr1-dev am:
c1f1c627c8 am:
7bed084759 am:
af3f55e2e2 am:
58b9373cc5 am:
0544dc9d0d
am:
a3292e76a4
Change-Id: I9f2cb308de4885fbdd130fe82972a4ba44eca57a
Myles Watson [Wed, 7 Feb 2018 21:49:29 +0000 (21:49 +0000)]
Merge "Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into cw-f-dev am:
836d07dd77" into nyc-mr2-dev
am:
206be7e884
Change-Id: I62e8fd090d35757277d49e0f2d8ad74f600559fa
Myles Watson [Wed, 7 Feb 2018 21:48:21 +0000 (21:48 +0000)]
Merge "Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into cw-f-dev am:
09c96fcc30" into nyc-mr2-dev am:
83f0c05bcb
am:
02fe8680a0
Change-Id: I4df1b7e1434307e1799abf88c4108083c96307a6
Myles Watson [Wed, 7 Feb 2018 21:47:49 +0000 (21:47 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr2-dev am:
e285901834
am:
a910b735ca
Change-Id: Ica72ca861c304c1a6921900d38242fe40e1dfcd7
Myles Watson [Wed, 7 Feb 2018 21:47:12 +0000 (21:47 +0000)]
Merge changes from topic "am-
a3017cc6c28740f4a52f9ef5d5b9be0e" into oc-dev
am:
d936f1f22f
Change-Id: I31c1da3e1ca08ac5f697ff344ca067084ada18f8
Android Build Merger (Role) [Wed, 7 Feb 2018 21:46:41 +0000 (21:46 +0000)]
Merge changes from topic "am-
e4209b1fdb924afeb6b600eabca4a64d" into oc-dev
* changes:
[automerger] Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into cw-f-dev am:
836d07dd77 am:
f50146b52f
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into cw-f-dev am:
836d07dd77
Android Build Merger (Role) [Wed, 7 Feb 2018 21:46:41 +0000 (21:46 +0000)]
Merge "Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into cw-f-dev am:
836d07dd77" into nyc-mr2-dev
Myles Watson [Wed, 7 Feb 2018 21:46:34 +0000 (21:46 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-mr2-dev am:
30b21cde00 am:
b184d4f110 am:
540d8466ca
am:
110e369e51
Change-Id: I7802215ec0388b7ea3d80cd337eb235439de746e
Myles Watson [Wed, 7 Feb 2018 21:46:30 +0000 (21:46 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into oc-dev
am:
50154c463a
Change-Id: Ia7e83c29894b0e8eb0a7669485cfabc2ae1bd00c
Android Build Merger (Role) [Wed, 7 Feb 2018 21:46:27 +0000 (21:46 +0000)]
[automerger] Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into cw-f-dev am:
836d07dd77 am:
f50146b52f
Change-Id: I5fb77e41c847564ba4f3434ae00182c8a2d3cc16
Android Build Merger (Role) [Wed, 7 Feb 2018 21:46:02 +0000 (21:46 +0000)]
[automerger] Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr1-dev am:
c6f379e4f2 am:
9cbe0a31a3 am:
c83a890ca2
Change-Id: I3efa3017776d915345e8f80612b376b5ee7e8f81
Myles Watson [Wed, 7 Feb 2018 21:46:00 +0000 (21:46 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into oc-dev am:
4245009354 am:
189d1b5135
am:
a86cea5d7b
Change-Id: I60b1527f76b0b09d172d2155fd5a4ae0bcbe9864
Android Build Merger (Role) [Wed, 7 Feb 2018 21:45:59 +0000 (21:45 +0000)]
[automerger] Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr1-dev am:
c6f379e4f2 am:
9cbe0a31a3
Change-Id: I4463f4d0e21b62b49bf383e33356c7bcc4cc7868
Myles Watson [Wed, 7 Feb 2018 21:45:56 +0000 (21:45 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-mr1-dev am:
5666c37ad1 am:
dfef16ff78 am:
9cd44cac30 am:
136f030d24
am:
ab42c06260
Change-Id: I39856ba2096714c9a68cb65327a5e0047e8188e5
Myles Watson [Wed, 7 Feb 2018 21:45:53 +0000 (21:45 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-dr1-dev am:
c1f1c627c8 am:
7bed084759 am:
af3f55e2e2 am:
58b9373cc5
am:
0544dc9d0d
Change-Id: I1fc36b9df7c7ed0528d81c8e0274407b9edb60fd
Myles Watson [Wed, 7 Feb 2018 21:45:52 +0000 (21:45 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into cw-f-dev
am:
836d07dd77
Change-Id: Ia4d97ae4be5d06e747af9a5066421341b2a2924e
Myles Watson [Wed, 7 Feb 2018 21:45:49 +0000 (21:45 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr1-dev
am:
c6f379e4f2
Change-Id: I21bf545d257a9f6142c173de869dbad766c804d6
Myles Watson [Wed, 7 Feb 2018 21:42:27 +0000 (21:42 +0000)]
Merge "Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into cw-f-dev am:
09c96fcc30" into nyc-mr2-dev
am:
83f0c05bcb
Change-Id: Ide0d1d6f6e17a18a4e8e5a8ebab10eded62b2ef1
Myles Watson [Wed, 7 Feb 2018 21:42:24 +0000 (21:42 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-mr2-dev am:
30b21cde00 am:
b184d4f110
am:
540d8466ca
Change-Id: If98a5342175084cf78d4d8b1600183f4e1bbf87d
Myles Watson [Wed, 7 Feb 2018 21:42:03 +0000 (21:42 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr2-dev
am:
e285901834
Change-Id: Ie5150e770e355a36d3924c93e2dc2ffef034c3d4
Myles Watson [Wed, 7 Feb 2018 21:41:57 +0000 (21:41 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-mr1-dev am:
5666c37ad1 am:
dfef16ff78 am:
9cd44cac30
am:
136f030d24
Change-Id: Ib1f03a8873deb4fdc55c6ceabb843607920c2694
Myles Watson [Wed, 7 Feb 2018 21:41:55 +0000 (21:41 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into oc-dev am:
4245009354
am:
189d1b5135
Change-Id: I53f809d0fcf3130687dc13606b55c4daea9f7d4b
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:58 +0000 (21:39 +0000)]
Merge changes from topic "am-
a3017cc6c28740f4a52f9ef5d5b9be0e" into oc-dev
* changes:
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into cw-f-dev am:
09c96fcc30 am:
e8403e2cf3
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into cw-f-dev am:
09c96fcc30
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:58 +0000 (21:39 +0000)]
Merge "Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into cw-f-dev am:
09c96fcc30" into nyc-mr2-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:49 +0000 (21:39 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into oc-dev
* changes:
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041 am:
a4c2f193e7 am:
7781bec06e skipped:
349d1fb596
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041 am:
a4c2f193e7 am:
7781bec06e
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041 am:
a4c2f193e7
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041
Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:49 +0000 (21:39 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into cw-f-dev
* changes:
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041 am:
a4c2f193e7
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041
Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:49 +0000 (21:39 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr1-dev
* changes:
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041
Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:49 +0000 (21:39 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr2-dev
* changes:
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041 am:
a4c2f193e7 am:
7781bec06e
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041 am:
a4c2f193e7
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041
Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:45 +0000 (21:39 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into cw-f-dev am:
09c96fcc30 am:
e8403e2cf3
Change-Id: I1bb052f71ab88caf5628c594ba4169082b476218
Myles Watson [Wed, 7 Feb 2018 21:39:25 +0000 (21:39 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-mr2-dev am:
30b21cde00
am:
b184d4f110
Change-Id: I4e3c614fa2847bdc4005bd1e284df3c595508104
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:08 +0000 (21:39 +0000)]
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041 am:
a4c2f193e7 am:
7781bec06e skipped:
349d1fb596
Change-Id: Iea1c1e5a791b6ee03714e23daafc317b8b4b670b
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:06 +0000 (21:39 +0000)]
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041 am:
a4c2f193e7 am:
7781bec06e
Change-Id: I8c52ee09952bb03da09418a86a7865070177fbdd
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:04 +0000 (21:39 +0000)]
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041 am:
a4c2f193e7
Change-Id: I6393804bc9845ac8cd3f62f38df52206dd62cbcc
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:03 +0000 (21:39 +0000)]
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041
Change-Id: I5bb77085b74b30710f7c4eb41f4a183ee46ab37b
Android Build Merger (Role) [Wed, 7 Feb 2018 21:38:56 +0000 (21:38 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-dr1-dev am:
c1f1c627c8 am:
7bed084759 am:
af3f55e2e2 am:
58b9373cc5
Change-Id: Idc40781aed669a80681e19a61858f19b7c1ac8c0
Myles Watson [Wed, 7 Feb 2018 21:38:56 +0000 (21:38 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into oc-dev
am:
4245009354
Change-Id: I10def675db30ca0a5c52af4f2cee258201f4560b
Android Build Merger (Role) [Wed, 7 Feb 2018 21:38:55 +0000 (21:38 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-dr1-dev am:
c1f1c627c8 am:
7bed084759 am:
af3f55e2e2
Change-Id: I5930c000a4b9fb01d40ed611c1bd77efcda1b8f5
Android Build Merger (Role) [Wed, 7 Feb 2018 21:38:54 +0000 (21:38 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-dr1-dev am:
c1f1c627c8 am:
7bed084759
Change-Id: I4084cc2a26b76c3b95ca91b700463e0edfaf4a4d
Myles Watson [Wed, 7 Feb 2018 21:38:49 +0000 (21:38 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into cw-f-dev
am:
09c96fcc30
Change-Id: I97e8920d59b6f2e267e5407dfbd02b34e8cc0f10
Myles Watson [Wed, 7 Feb 2018 21:38:45 +0000 (21:38 +0000)]
Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev
am:
87d9e19727
Change-Id: If7db6b29ed6a842349b7070ec9692b2b1faeb0cd
Myles Watson [Wed, 7 Feb 2018 21:38:42 +0000 (21:38 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-dr1-dev
am:
c1f1c627c8
Change-Id: I921df8b46b290f25ec3e3876f0669766ee035257
Android Build Merger (Role) [Wed, 7 Feb 2018 21:38:26 +0000 (21:38 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-mr1-dev am:
5666c37ad1 am:
dfef16ff78 am:
9cd44cac30
Change-Id: I4822fadd69527526689fb89052d5154563bb1706
Android Build Merger (Role) [Wed, 7 Feb 2018 21:38:25 +0000 (21:38 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-mr1-dev am:
5666c37ad1 am:
dfef16ff78
Change-Id: I9be8980f56bb4baf9b427e7390f5dbc2a9682dd2
Myles Watson [Wed, 7 Feb 2018 21:38:17 +0000 (21:38 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-mr2-dev
am:
30b21cde00
Change-Id: Ib777a1d7ed1c1541b3fecd513ac52c6e0f027698
Myles Watson [Wed, 7 Feb 2018 21:38:14 +0000 (21:38 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-mr1-dev
am:
5666c37ad1
Change-Id: Ib9f91cd05f2bca87756c033091c7fb6b237ff680
TreeHugger Robot [Wed, 7 Feb 2018 21:28:42 +0000 (21:28 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea am:
6738c90bec
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea
DO NOT MERGE: SDP: Check p_req_end before reading from p_req
TreeHugger Robot [Wed, 7 Feb 2018 21:28:42 +0000 (21:28 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into oc-dev
* changes:
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea am:
6738c90bec am:
5d8bf075db am:
8604b579ec skipped:
6c1fe0668d
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea am:
6738c90bec am:
5d8bf075db am:
8604b579ec
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea am:
6738c90bec am:
5d8bf075db
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea am:
6738c90bec
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea
DO NOT MERGE: SDP: Check p_req_end before reading from p_req
TreeHugger Robot [Wed, 7 Feb 2018 21:28:42 +0000 (21:28 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea am:
6738c90bec am:
5d8bf075db am:
8604b579ec
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea am:
6738c90bec am:
5d8bf075db
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea am:
6738c90bec
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea
DO NOT MERGE: SDP: Check p_req_end before reading from p_req
TreeHugger Robot [Wed, 7 Feb 2018 21:28:42 +0000 (21:28 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into cw-f-dev
* changes:
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea am:
6738c90bec am:
5d8bf075db
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea am:
6738c90bec
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea
DO NOT MERGE: SDP: Check p_req_end before reading from p_req
TreeHugger Robot [Wed, 7 Feb 2018 21:28:42 +0000 (21:28 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
d321b13fea
DO NOT MERGE: SDP: Check p_req_end before reading from p_req
TreeHugger Robot [Wed, 7 Feb 2018 21:28:42 +0000 (21:28 +0000)]
Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev
Myles Watson [Wed, 7 Feb 2018 21:16:50 +0000 (21:16 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
c5ceedf2f4 am:
5c6b00689a am:
8b680c2ac4 skipped:
d2a6ebc407 am:
5a512bd29f am:
063e487cb1 am:
1170310876 am:
8e70cd4d15 skipped:
bf26e15f10 am:
7599a9fa30 am:
c3cb8be6cb
am:
c55f8e97c6
Change-Id: Ib198d62205a560537faef6edd05295b09d327bb3
Myles Watson [Wed, 7 Feb 2018 21:12:47 +0000 (21:12 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
c5ceedf2f4 am:
5c6b00689a am:
8b680c2ac4 skipped:
d2a6ebc407 am:
5a512bd29f am:
063e487cb1 am:
1170310876 am:
8e70cd4d15 skipped:
bf26e15f10 am:
7599a9fa30
am:
c3cb8be6cb
Change-Id: I7d83cdc994cc1edcb386d38cf2da9110c79a1f79
Myles Watson [Wed, 7 Feb 2018 21:08:14 +0000 (21:08 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
c5ceedf2f4 am:
5c6b00689a am:
8b680c2ac4 skipped:
d2a6ebc407 am:
5a512bd29f am:
063e487cb1 am:
1170310876 am:
8e70cd4d15 skipped:
bf26e15f10
am:
7599a9fa30
Change-Id: If15fb763a0b815d01e374552423d9f9ddd985867
Jakub Pawlowski [Wed, 7 Feb 2018 19:37:18 +0000 (11:37 -0800)]
Call BTA_GATTS_AddService on correct thread
Right now BTA_GATTS_AddService is incorrectly called on btif thread.
This might lead to situations where it is executed while bta thread is
already cleaning up, and deleted the control blocks, resulting in crashes.
From now on, execute it on bta thread. This ensures that it is executed
before control blocks are freed.
Test: sl4a GattClientTest
Bug:
73054849
Change-Id: Ie2bf80414bceba2590c21d3825c78fbb58449520
Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:22 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
c5ceedf2f4 am:
5c6b00689a am:
8b680c2ac4 skipped:
d2a6ebc407 am:
5a512bd29f am:
063e487cb1 am:
1170310876 am:
8e70cd4d15 skipped:
bf26e15f10
Change-Id: I2682a0552a8579c401b4a49af3145b5577f0c53b
Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:21 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
c5ceedf2f4 am:
5c6b00689a am:
8b680c2ac4 skipped:
d2a6ebc407 am:
5a512bd29f am:
063e487cb1 am:
1170310876 am:
8e70cd4d15
Change-Id: Id62a6bf04ff44e2b2f28b3e318886907c25d6456
Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:19 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
c5ceedf2f4 am:
5c6b00689a am:
8b680c2ac4 skipped:
d2a6ebc407 am:
5a512bd29f am:
063e487cb1 am:
1170310876
Change-Id: Ic06dca7bd702f558399969217c3df23b9a43b14e
Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:18 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
c5ceedf2f4 am:
5c6b00689a am:
8b680c2ac4 skipped:
d2a6ebc407 am:
5a512bd29f am:
063e487cb1
Change-Id: I6d3794a99a85aad5d1546b94b693db91a7d9adef
Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:17 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
c5ceedf2f4 am:
5c6b00689a am:
8b680c2ac4 skipped:
d2a6ebc407 am:
5a512bd29f
Change-Id: Ie69e1fd2e30742edc770e58d62c142692914b873
Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:16 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am:
c5ceedf2f4 am:
5c6b00689a am:
8b680c2ac4 skipped:
d2a6ebc407
Change-Id: Iae89be86bc20908521d2c99a099f8728c4e9f820
OSDN Git Service
