OSDN Git Service
Andre Eisenbach [Thu, 17 Aug 2017 01:21:16 +0000 (01:21 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
294cc61f4f am:
5dc24c7b41 am:
8498351370 am:
615de1d1fe -s ours am:
1ee8850324 -s ours am:
27e67ba277 -s ours am:
5af8ec6e85 -s ours am:
bc2ddd916c -s ours am:
ad12cf8070 -s ours am:
eb80110ae4 -s ours am:
672f067faf -s ours
am:
259862a907 -s ours
Change-Id: Iea64733e8abdcd5d0cb8586b687c153ca120b812
Andre Eisenbach [Thu, 17 Aug 2017 01:02:44 +0000 (01:02 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
294cc61f4f am:
5dc24c7b41 am:
8498351370 am:
615de1d1fe -s ours am:
1ee8850324 -s ours am:
27e67ba277 -s ours am:
5af8ec6e85 -s ours am:
bc2ddd916c -s ours am:
ad12cf8070 -s ours am:
eb80110ae4 -s ours
am:
672f067faf -s ours
Change-Id: I4efbd2fe500d309b9211128d785eea8a54d87792
Andre Eisenbach [Thu, 17 Aug 2017 01:00:29 +0000 (01:00 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
294cc61f4f am:
5dc24c7b41 am:
8498351370 am:
615de1d1fe -s ours am:
1ee8850324 -s ours am:
27e67ba277 -s ours am:
5af8ec6e85 -s ours am:
bc2ddd916c -s ours am:
ad12cf8070 -s ours am:
eb80110ae4 -s ours am:
e6902fa770 -s ours
am:
7aeb92d675 -s ours
Change-Id: I4ef30e304141201dbcf7e0afb265d3ae2289a2cf
Andre Eisenbach [Thu, 17 Aug 2017 01:00:02 +0000 (01:00 +0000)]
Merge "SDP: Bounds check 'id' parameter for free_sdp_slot() am:
82e4754aaa am:
3b90fd7b0c am:
33aee8d11e am:
d772aec66b am:
c8d256c052 -s ours am:
7fe92a7abf -s ours am:
1f1b4d003f -s ours" into oc-dr1-dev-plus-aosp
am:
91efee1245 -s ours
Change-Id: Ib565ae2d26bc396d49bca58b9887665e5e185293
Andre Eisenbach [Thu, 17 Aug 2017 00:59:38 +0000 (00:59 +0000)]
Merge "SDP: Bounds check 'id' parameter for free_sdp_slot() am:
82e4754aaa am:
3b90fd7b0c am:
33aee8d11e am:
d772aec66b am:
c8d256c052 -s ours am:
7fe92a7abf -s ours am:
65fc86d417 -s ours" into oc-dr1-dev-plus-aosp
am:
3770ea312f -s ours
Change-Id: I032593e083e9b169cad0c0aaa4587c4d3d9080a4
Chih-Hung Hsieh [Thu, 17 Aug 2017 00:59:00 +0000 (00:59 +0000)]
Fix misc-macro-parentheses warnings in system/bt. am:
fc25b19606 am:
435140c19f am:
8334c3612c
am:
98889414c8
Change-Id: Ia33a4997df69c3c7a3643fce45bdb122354b07a8
Andre Eisenbach [Thu, 17 Aug 2017 00:55:44 +0000 (00:55 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
294cc61f4f am:
5dc24c7b41 am:
8498351370 am:
615de1d1fe -s ours am:
1ee8850324 -s ours am:
27e67ba277 -s ours am:
5af8ec6e85 -s ours am:
bc2ddd916c -s ours am:
ad12cf8070 -s ours am:
eb80110ae4 -s ours
am:
e6902fa770 -s ours
Change-Id: I5d6ce7b101ecf5749c380fcc88b00ed95f284218
Andre Eisenbach [Thu, 17 Aug 2017 00:53:40 +0000 (00:53 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
294cc61f4f am:
5dc24c7b41 am:
8498351370 am:
615de1d1fe -s ours am:
1ee8850324 -s ours am:
27e67ba277 -s ours am:
5af8ec6e85 -s ours am:
bc2ddd916c -s ours am:
ad12cf8070 -s ours
am:
eb80110ae4 -s ours
Change-Id: Ie41f709b2f47fcf629022c561b3c712ae90ac572
Andre Eisenbach [Thu, 17 Aug 2017 00:53:40 +0000 (00:53 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
294cc61f4f am:
5dc24c7b41 am:
8498351370 am:
615de1d1fe -s ours am:
1ee8850324 -s ours am:
27e67ba277 -s ours am:
5af8ec6e85 -s ours am:
bc2ddd916c -s ours am:
ad12cf8070 -s ours
am:
eb80110ae4 -s ours
Change-Id: I66e5cfc1a169c98b877246ff7dc8940d209ea260
Andre Eisenbach [Thu, 17 Aug 2017 00:51:13 +0000 (00:51 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
294cc61f4f am:
5dc24c7b41 am:
8498351370 am:
615de1d1fe -s ours am:
1ee8850324 -s ours am:
27e67ba277 -s ours am:
5af8ec6e85 -s ours am:
bc2ddd916c -s ours
am:
ad12cf8070 -s ours
Change-Id: I98a440d9bfa53e413c531b2afa510b52c02104cc
Andre Eisenbach [Thu, 17 Aug 2017 00:49:09 +0000 (00:49 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
294cc61f4f am:
5dc24c7b41 am:
8498351370 am:
615de1d1fe -s ours am:
1ee8850324 -s ours am:
27e67ba277 -s ours am:
5af8ec6e85 -s ours
am:
bc2ddd916c -s ours
Change-Id: Iad7cf407257de1788102f83e7ceafaf9167655c9
Andre Eisenbach [Thu, 17 Aug 2017 00:46:40 +0000 (00:46 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
294cc61f4f am:
5dc24c7b41 am:
8498351370 am:
615de1d1fe -s ours am:
1ee8850324 -s ours am:
27e67ba277 -s ours
am:
5af8ec6e85 -s ours
Change-Id: I8971c22e6641d46e2d1fba13fe55407e3386acb2
Andre Eisenbach [Thu, 17 Aug 2017 00:45:10 +0000 (00:45 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
294cc61f4f am:
5dc24c7b41 am:
8498351370 am:
615de1d1fe -s ours am:
1ee8850324 -s ours
am:
27e67ba277 -s ours
Change-Id: I5fb42670d4a641b39a14e538057a0193d33afb0e
Android Build Merger (Role) [Thu, 17 Aug 2017 00:43:06 +0000 (00:43 +0000)]
Merge "SDP: Bounds check 'id' parameter for free_sdp_slot() am:
82e4754aaa am:
3b90fd7b0c am:
33aee8d11e am:
d772aec66b am:
c8d256c052 -s ours am:
7fe92a7abf -s ours am:
1f1b4d003f -s ours" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 17 Aug 2017 00:43:01 +0000 (00:43 +0000)]
Merge "SDP: Bounds check 'id' parameter for free_sdp_slot() am:
82e4754aaa am:
3b90fd7b0c am:
33aee8d11e am:
d772aec66b am:
c8d256c052 -s ours am:
7fe92a7abf -s ours am:
65fc86d417 -s ours" into oc-dr1-dev-plus-aosp
Andre Eisenbach [Thu, 17 Aug 2017 00:42:54 +0000 (00:42 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
82e4754aaa am:
3b90fd7b0c am:
33aee8d11e am:
d772aec66b am:
c8d256c052 -s ours am:
7fe92a7abf -s ours
am:
1f1b4d003f -s ours
Change-Id: I0eb482bda56185c2742fb300f607ea001df09ed7
Andre Eisenbach [Thu, 17 Aug 2017 00:42:46 +0000 (00:42 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
82e4754aaa am:
3b90fd7b0c am:
33aee8d11e am:
d772aec66b am:
c8d256c052 -s ours am:
7fe92a7abf -s ours
am:
65fc86d417 -s ours
Change-Id: Ib4f54de3aa03ca302a3e222c0aa9500ad969b834
Andre Eisenbach [Thu, 17 Aug 2017 00:42:45 +0000 (00:42 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
294cc61f4f am:
5dc24c7b41 am:
8498351370 am:
615de1d1fe -s ours
am:
1ee8850324 -s ours
Change-Id: I5f54fca3ea0d17cad9a5e5439265c9b40340036c
Chih-Hung Hsieh [Thu, 17 Aug 2017 00:42:31 +0000 (00:42 +0000)]
Fix misc-macro-parentheses warnings in system/bt. am:
fc25b19606 am:
435140c19f
am:
8334c3612c
Change-Id: I5069f282fd5d2a1e993f33c66fef7f7e1f25c9f7
Andre Eisenbach [Thu, 17 Aug 2017 00:39:39 +0000 (00:39 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
294cc61f4f am:
5dc24c7b41 am:
8498351370
am:
615de1d1fe -s ours
Change-Id: I2e6425620ccf65636ba0b0ba6c783c8bf8764ec0
Andre Eisenbach [Thu, 17 Aug 2017 00:37:42 +0000 (00:37 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
294cc61f4f am:
5dc24c7b41
am:
8498351370
Change-Id: I171cafa603f3bf9d6a91895aba461fa96711c18c
Andre Eisenbach [Thu, 17 Aug 2017 00:32:37 +0000 (00:32 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
294cc61f4f
am:
5dc24c7b41
Change-Id: I27dffd6583706912f79cfd730eca390e930e9294
Andre Eisenbach [Thu, 17 Aug 2017 00:30:38 +0000 (00:30 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot()
am:
294cc61f4f
Change-Id: Ief8d911221408ff79a5addc7a7d58c7ca1a38808
Andre Eisenbach [Thu, 17 Aug 2017 00:28:39 +0000 (00:28 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
82e4754aaa am:
3b90fd7b0c am:
33aee8d11e am:
d772aec66b am:
c8d256c052 -s ours
am:
7fe92a7abf -s ours
Change-Id: Ie383a65f8f6b2593f4c4bf32cea0179521e351b3
Andre Eisenbach [Thu, 17 Aug 2017 00:20:52 +0000 (00:20 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
82e4754aaa am:
3b90fd7b0c am:
33aee8d11e am:
d772aec66b am:
c8d256c052 -s ours
am:
7fe92a7abf -s ours
Change-Id: Ied810a83773b7588b09317ce055a55519ec8e80c
Chih-Hung Hsieh [Thu, 17 Aug 2017 00:19:18 +0000 (00:19 +0000)]
Fix misc-macro-parentheses warnings in system/bt. am:
fc25b19606
am:
435140c19f
Change-Id: I0161b80115cbeb6a5754e54c2c3c7cc89b0ca821
Chih-Hung Hsieh [Thu, 17 Aug 2017 00:09:12 +0000 (00:09 +0000)]
Fix misc-macro-parentheses warnings in system/bt.
am:
fc25b19606
Change-Id: I7ef5175514d7f1483743c20c916854f1e4cce687
Andre Eisenbach [Thu, 17 Aug 2017 00:03:55 +0000 (00:03 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
82e4754aaa am:
3b90fd7b0c am:
33aee8d11e am:
d772aec66b
am:
c8d256c052 -s ours
Change-Id: I0c563fdf2b28e8b50abab9f6d9a1b1851a13a2ab
Andre Eisenbach [Wed, 16 Aug 2017 23:45:18 +0000 (23:45 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
82e4754aaa am:
3b90fd7b0c am:
33aee8d11e
am:
d772aec66b
Change-Id: I41ed5d1d9f8efa504941b7084aa955496dfe0ec3
Andre Eisenbach [Wed, 16 Aug 2017 23:27:46 +0000 (23:27 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
82e4754aaa am:
3b90fd7b0c
am:
33aee8d11e
Change-Id: Ie3991cdfd834d3d0ff736562af300251fd70f96c
Andre Eisenbach [Wed, 16 Aug 2017 23:07:45 +0000 (23:07 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
82e4754aaa
am:
3b90fd7b0c
Change-Id: I2e9769b83ab39cfc51320b1116959780dd5d92da
Chih-Hung Hsieh [Tue, 1 Aug 2017 22:04:23 +0000 (15:04 -0700)]
Fix misc-macro-parentheses warnings in system/bt.
* Use NOLINT to suppress missing parentheses warnings around bitmask.
Bug:
28705665
Test: make with WITH_TIDY=1 WITH_TIDY_CHECKS=-*,misc-macro-* \
WITH_TIDY_FLAGS=-header-filter=system/bt/.*
Change-Id: I4f095898d49eafdea9eb72f9ffc9eac87f68a4c8
Andre Eisenbach [Wed, 16 Aug 2017 22:52:42 +0000 (22:52 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot()
am:
82e4754aaa
Change-Id: Ica0050f493b45e216daa4c31e6eea38a4921d356
Andre Eisenbach [Wed, 16 Aug 2017 18:24:32 +0000 (18:24 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
b413f1b136 am:
a708395ce2
am:
bb1c040e1d
Change-Id: Ic51da074c101d260faa937560c5defda17485615
Andre Eisenbach [Wed, 16 Aug 2017 17:59:38 +0000 (17:59 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
b413f1b136 am:
a708395ce2
am:
b4cf9d5b81
Change-Id: Icc04412ba8aedaf0f933725de2d590906a6fd4d6
Andre Eisenbach [Wed, 16 Aug 2017 17:59:15 +0000 (17:59 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
b413f1b136 am:
8fdf601167
am:
1960750cfb
Change-Id: Ia386864e0a70111da60e7933db689397acb30973
Andre Eisenbach [Wed, 16 Aug 2017 17:40:42 +0000 (17:40 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
b413f1b136
am:
a708395ce2
Change-Id: I9c853eff3b6982fc183940dc7d586bb7f2802239
Andre Eisenbach [Wed, 16 Aug 2017 17:37:42 +0000 (17:37 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
b413f1b136
am:
a708395ce2
Change-Id: I6939a5c1ad822a09177705032a7ba9ef4da3e4d0
Andre Eisenbach [Wed, 16 Aug 2017 17:33:41 +0000 (17:33 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot() am:
b413f1b136
am:
8fdf601167
Change-Id: I1dbc18e8758ef322e809180d3ff81c15909311e5
Andre Eisenbach [Wed, 16 Aug 2017 17:25:11 +0000 (17:25 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot()
am:
b413f1b136
Change-Id: I2a51738b15ab49d419a95a1f14abf87aa2542af1
Andre Eisenbach [Wed, 16 Aug 2017 17:22:44 +0000 (17:22 +0000)]
SDP: Bounds check 'id' parameter for free_sdp_slot()
am:
b413f1b136
Change-Id: I731b84859091c5580b358678830b59914dad5f42
Jack He [Wed, 16 Aug 2017 03:02:17 +0000 (03:02 +0000)]
Fix errors in handling RawAddresses
am:
5f6ecfac76
Change-Id: I66555b8b6ab9c6249cce4518370c6f4cb244cd45
Jack He [Wed, 16 Aug 2017 01:03:09 +0000 (01:03 +0000)]
Fix errors in handling RawAddresses am:
882aec320e am:
1a6a640a36 am:
e1562503ff
am:
7470b5d5a5
Change-Id: Ib1fe75b73fcb2a5c9b9d065aee0181367c3e6ef8
Jack He [Wed, 16 Aug 2017 00:45:06 +0000 (00:45 +0000)]
Fix errors in handling RawAddresses am:
882aec320e am:
1a6a640a36
am:
e1562503ff
Change-Id: Ifb33c101cd8fde1b4bd11b7aec0903c4244a837a
Jack He [Wed, 16 Aug 2017 00:32:05 +0000 (00:32 +0000)]
Fix errors in handling RawAddresses am:
882aec320e
am:
1a6a640a36
Change-Id: I52bc8277153bc439f652311c2eff00f34f214480
Jack He [Wed, 16 Aug 2017 00:23:04 +0000 (00:23 +0000)]
Fix errors in handling RawAddresses
am:
882aec320e
Change-Id: If23c7e9bf4231ec3398d0de21c0656a240935209
Jack He [Tue, 15 Aug 2017 06:02:16 +0000 (23:02 -0700)]
Fix errors in handling RawAddresses
* In change I8d1bd6914aec55bb53495b1d0d5e3d37b86865e6
memcmp(a, b, LEN) != 0 should be translated to
A != B
* memcpy should not be applied to RawAddress objects.
Assignment operator should be used instead.
* memset should not be applied to RawAddress objects.
Assignment to RawAddress::kEmpty should be used.
* Fixed a crash in GATT
Bug:
64316340
Test: Unit test, pair with device and transmit
Change-Id: Iceefab821c1d45a88194d87a43a192afa5f263fd
(cherry picked from commit
882aec320e88b0860a3d53db828bb099c7ca2409)
Jack He [Tue, 15 Aug 2017 06:02:16 +0000 (23:02 -0700)]
Fix errors in handling RawAddresses
* In change I8d1bd6914aec55bb53495b1d0d5e3d37b86865e6
memcmp(a, b, LEN) != 0 should be translated to
A != B
* memcpy should not be applied to RawAddress objects.
Assignment operator should be used instead.
* memset should not be applied to RawAddress objects.
Assignment to RawAddress::kEmpty should be used.
* Fixed a crash in GATT
Bug:
64316340
Test: Unit test, pair with device and transmit
Change-Id: Iceefab821c1d45a88194d87a43a192afa5f263fd
johnshamoon [Fri, 11 Aug 2017 06:07:19 +0000 (06:07 +0000)]
Merge "test_vendor: Add function to extract bytes from iterators" am:
9a7f50c041 am:
1dcc643f74 am:
8d47bcb5e1
am:
624c50698d
Change-Id: Id7968b4d31ff80cca8c741a624e6c121142c4271
johnshamoon [Fri, 11 Aug 2017 06:03:20 +0000 (06:03 +0000)]
Merge "test_vendor: Add function to extract bytes from iterators" am:
9a7f50c041 am:
1dcc643f74
am:
8d47bcb5e1
Change-Id: Ia448deb3ab32f43166bba4402f27fb17dbcf408a
johnshamoon [Fri, 11 Aug 2017 05:59:20 +0000 (05:59 +0000)]
Merge "test_vendor: Add function to extract bytes from iterators" am:
9a7f50c041
am:
1dcc643f74
Change-Id: I5d1f05416df73f3d3f6432a6e1f506fc544a238f
johnshamoon [Fri, 11 Aug 2017 05:54:20 +0000 (05:54 +0000)]
Merge "test_vendor: Add function to extract bytes from iterators"
am:
9a7f50c041
Change-Id: I588d3a7fd6dce5c2eaf1aea9944e4d45663e3dd0
Treehugger Robot [Fri, 11 Aug 2017 05:46:08 +0000 (05:46 +0000)]
Merge "test_vendor: Add function to extract bytes from iterators"
johnshamoon [Wed, 9 Aug 2017 03:38:28 +0000 (20:38 -0700)]
test_vendor: Add function to extract bytes from iterators
The extract function extracts a number of bytes from the type that the
iterator is pointing to. The iterator will be incremented to the value
after the last byte after extract is called.
Fixed the bounds of the for loop in the preIncrementTest so that it
does not try to dereference the sentinel after the last value.
Test: Passes unit tests in test/iterator_test.cc
Change-Id: I07944641b829c820bbe40d612d7f065e514516b3
Ting-Yuan Huang [Thu, 10 Aug 2017 18:35:05 +0000 (18:35 +0000)]
osi: Suppress length warning in config parsing am:
8b7968085b am:
1b63c106d4 am:
a079f052da
am:
c307a8a598
Change-Id: I5eb58ccaaa9034dc92d8e12df1d2a130d5aab64b
Ting-Yuan Huang [Thu, 10 Aug 2017 18:28:24 +0000 (18:28 +0000)]
osi: Suppress length warning in config parsing am:
8b7968085b am:
1b63c106d4
am:
a079f052da
Change-Id: I73b0cee3d1ad82c061fd7b9d725160ce86da193e
Ting-Yuan Huang [Thu, 10 Aug 2017 18:20:47 +0000 (18:20 +0000)]
osi: Suppress length warning in config parsing am:
8b7968085b
am:
1b63c106d4
Change-Id: I6d38fee565d635ba2a9ca89ac3b078b654e3d182
Ting-Yuan Huang [Thu, 10 Aug 2017 18:13:18 +0000 (18:13 +0000)]
osi: Suppress length warning in config parsing
am:
8b7968085b
Change-Id: I338ec794dcc5db22ee4615ef139500c44eb1cf2b
Ting-Yuan Huang [Tue, 9 May 2017 23:35:46 +0000 (16:35 -0700)]
osi: Suppress length warning in config parsing
Bug:
38178471
Test: Built without seeing the warning at the line
Change-Id: I1f8a5fc58313456921891700a3039cad1715b4d0
Jakub Pawlowski [Thu, 10 Aug 2017 00:10:34 +0000 (00:10 +0000)]
resolve merge conflicts of
0a5d9ebb0b15976b47eaff77bb66a257b8b114bb to stage-aosp-master am:
ca61556a76 am:
fe37b1e8f8
am:
94d4464c05
Change-Id: I0a432185011a613963e71bc970a81871aa1c047e
Andre Eisenbach [Tue, 8 Aug 2017 23:51:12 +0000 (16:51 -0700)]
SDP: Bounds check 'id' parameter for free_sdp_slot()
Merged-In: I34e8296ec7ec6b4ffbe1fa0452754f2a421e6ec7
Test: manual
Fixes:
37502513
Change-Id: I34e8296ec7ec6b4ffbe1fa0452754f2a421e6ec7
(cherry picked from commit
b413f1b1365af4273647727e497848f95312d0ec)
Andre Eisenbach [Tue, 8 Aug 2017 22:41:21 +0000 (15:41 -0700)]
SDP: Bounds check 'id' parameter for free_sdp_slot()
Merged-In: I34e8296ec7ec6b4ffbe1fa0452754f2a421e6ec7
Test: manual
Fixes:
37502513
Change-Id: I34e8296ec7ec6b4ffbe1fa0452754f2a421e6ec7
(cherry picked from commit
b413f1b1365af4273647727e497848f95312d0ec)
Jakub Pawlowski [Wed, 9 Aug 2017 19:50:25 +0000 (19:50 +0000)]
Bluetooth: move AIDL files related to Bluetooth into system/bt (2/3) am:
0a5d9ebb0b am:
0cc11eea12 am:
3bf1fb856e
am:
770056a2ee
Change-Id: I686b09c10b191d6bff3f0786803a8c0099fb3812
Jakub Pawlowski [Wed, 9 Aug 2017 16:23:37 +0000 (16:23 +0000)]
resolve merge conflicts of
0a5d9ebb0b15976b47eaff77bb66a257b8b114bb to stage-aosp-master am:
ca61556a76
am:
fe37b1e8f8
Change-Id: Idf45696c975e3c65d955e9a19c446bb471900536
Jakub Pawlowski [Wed, 9 Aug 2017 16:06:57 +0000 (16:06 +0000)]
resolve merge conflicts of
0a5d9ebb0b15976b47eaff77bb66a257b8b114bb to stage-aosp-master
am:
ca61556a76
Change-Id: I7d93c7bfd2fdd3bb0b80e0ef5400dd2432e035ac
Jakub Pawlowski [Wed, 9 Aug 2017 07:44:01 +0000 (00:44 -0700)]
resolve merge conflicts of
0a5d9ebb0b15976b47eaff77bb66a257b8b114bb to stage-aosp-master
Test: this fixes merge conflict that I skipped
Change-Id: Ie829182b01d01e5ae648165f30cfad7647a97db6
Merged-In: Ie829182b01d01e5ae648165f30cfad7647a97db5
Jakub Pawlowski [Wed, 9 Aug 2017 07:36:40 +0000 (07:36 +0000)]
Bluetooth: move AIDL files related to Bluetooth into system/bt (2/3) am:
0a5d9ebb0b am:
0cc11eea12
am:
3bf1fb856e
Change-Id: Ibee12f6369a62bedc0a6175c8e5e02e91beb69e0
Jakub Pawlowski [Wed, 9 Aug 2017 07:25:31 +0000 (07:25 +0000)]
Bluetooth: move AIDL files related to Bluetooth into system/bt (2/3) am:
0a5d9ebb0b
am:
0cc11eea12
Change-Id: Ia96a68b8c9fe6d070a917a7749ade226e7994d9d
Jakub Pawlowski [Wed, 9 Aug 2017 07:13:47 +0000 (07:13 +0000)]
Bluetooth: move AIDL files related to Bluetooth into system/bt (2/3)
am:
0a5d9ebb0b
Change-Id: I6a921b05aa32dbb9bf196635c17118de5d39d2b0
Andre Eisenbach [Tue, 8 Aug 2017 22:41:21 +0000 (15:41 -0700)]
SDP: Bounds check 'id' parameter for free_sdp_slot()
Test: manual
Fixes:
37502513
Change-Id: I34e8296ec7ec6b4ffbe1fa0452754f2a421e6ec7
Jakub Pawlowski [Tue, 8 Aug 2017 11:00:13 +0000 (04:00 -0700)]
Bluetooth: move AIDL files related to Bluetooth into system/bt (2/3)
This patch moves *.aidl files from
frameworks/base/core/java/android/bluetooth into system/bt/binder. This
is in preparation to convert the Bluetooth deamon into native
implementation piece by piece.
In order to do that, one must have C++ header files, and paths to them
with AIDL files, and */java/* folder didn't seem as proper place for
that. Additionally, keeping AIDL files out of framework/base will not
require creating dependency on this huge project, which should help
keeping the compilation fast.
Test: compilation test
Change-Id: I4c992e6ee16eea3173a49b1d37e961af3d3c9ac6
Merged-In: I4c992e6ee16eea3173a49b1d37e961af3d3c9ac6
(cherry picked from commit
8a12de49177a341a118c95435177fba4f12fe412)
Bailey Forrest [Mon, 7 Aug 2017 23:06:16 +0000 (23:06 +0000)]
Merge "Call bta_dm_sp_cback if BTM_LOCAL_IO_CAPS == BTM_IO_CAP_NONE" am:
9d098408ce am:
4a09400364 am:
ad3e4d8347
am:
77ccff6d94
Change-Id: I3be97177d9e738a2288a7abfba837b283aa0d4cc
Bailey Forrest [Mon, 7 Aug 2017 23:03:45 +0000 (23:03 +0000)]
Merge "Call bta_dm_sp_cback if BTM_LOCAL_IO_CAPS == BTM_IO_CAP_NONE" am:
9d098408ce am:
4a09400364
am:
ad3e4d8347
Change-Id: Id67303ca15e4f0e7649682c08fd54f34871f532c
Bailey Forrest [Mon, 7 Aug 2017 23:01:45 +0000 (23:01 +0000)]
Merge "Call bta_dm_sp_cback if BTM_LOCAL_IO_CAPS == BTM_IO_CAP_NONE" am:
9d098408ce
am:
4a09400364
Change-Id: I45dd43d6311339a67da18007176bd8c620c19487
Bailey Forrest [Mon, 7 Aug 2017 22:58:14 +0000 (22:58 +0000)]
Merge "Call bta_dm_sp_cback if BTM_LOCAL_IO_CAPS == BTM_IO_CAP_NONE"
am:
9d098408ce
Change-Id: I0988507f1ed8bd3a9138ecb80171d7cfd18a4031
Treehugger Robot [Mon, 7 Aug 2017 22:49:25 +0000 (22:49 +0000)]
Merge "Call bta_dm_sp_cback if BTM_LOCAL_IO_CAPS == BTM_IO_CAP_NONE"
Jakub Pawlowski [Mon, 7 Aug 2017 21:47:44 +0000 (21:47 +0000)]
Advertisement parsing fix for zero padding am:
436058ee3f
am:
aa77767edc -s ours
Change-Id: I16cad8fb3850334bdd8302427b71bcc1de7e287e
Jakub Pawlowski [Mon, 7 Aug 2017 21:40:55 +0000 (21:40 +0000)]
Advertisement parsing fix for zero padding am:
436058ee3f -s ours
am:
86cc6e9587 -s ours
Change-Id: I4d87ff34792e7bc8db471caee4c91e01b2476b57
Jakub Pawlowski [Mon, 7 Aug 2017 21:33:32 +0000 (21:33 +0000)]
Advertisement parsing fix for zero padding
am:
436058ee3f
Change-Id: I4c5a04c769d3f0366fed96881edb46cc9979cd6a
Jakub Pawlowski [Mon, 7 Aug 2017 21:33:32 +0000 (21:33 +0000)]
Advertisement parsing fix for zero padding
am:
436058ee3f -s ours
Change-Id: I8c586ba7ba15a21d69bb2c6efab8040f3a661960
Jakub Pawlowski [Fri, 4 Aug 2017 15:56:53 +0000 (08:56 -0700)]
Advertisement parsing fix for zero padding
When AD data is zero padded, and Scan Response is appended at end, data
becomes invalid. Instead, zero paddning must be removed first.
Test: AdvertiseDataParserTest.RemoveTrailingZeros
Bug:
38489707
Change-Id: I229ca3db6c92bc06bc1429e72412417010721063
Merged-In: I229ca3db6c92bc06bc1429e72412417010721063
(cherry picked from commit
35a9ea352d59e6d261eba1254814f7238e3ed022)
Pavlin Radoslavov [Mon, 7 Aug 2017 18:26:15 +0000 (18:26 +0000)]
Use a mutex to protect the scheduling of tBTA_PM_TIMER am:
a8ba0bd7c8
am:
bc2a167882
Change-Id: Ia3d8e40fa9826935be325a7daabc68d7347bc945
Pavlin Radoslavov [Mon, 7 Aug 2017 18:22:04 +0000 (18:22 +0000)]
Merge "Use a mutex to protect the scheduling of tBTA_PM_TIMER am:
a8ba0bd7c8" into oc-dr1-dev-plus-aosp
am:
05cf6226a3
Change-Id: Ie51f3c091fc21cb5fc1635b386a34fb8e565c606
Pavlin Radoslavov [Mon, 7 Aug 2017 18:21:45 +0000 (18:21 +0000)]
Use a mutex to protect the scheduling of tBTA_PM_TIMER am:
9e702a6aef am:
a6ba2c3c0a am:
c68fce56d0
am:
9f3304fba9
Change-Id: I33985065f5b5335ffe3f9f8cc1849ae1b7515d15
Pavlin Radoslavov [Mon, 7 Aug 2017 18:18:19 +0000 (18:18 +0000)]
Use a mutex to protect the scheduling of tBTA_PM_TIMER
am:
a8ba0bd7c8
Change-Id: I805c9e2156a3616e7be2bf17e34e2c353f5a0469
Android Build Merger (Role) [Mon, 7 Aug 2017 18:17:57 +0000 (18:17 +0000)]
Merge "Use a mutex to protect the scheduling of tBTA_PM_TIMER am:
a8ba0bd7c8" into oc-dr1-dev-plus-aosp
Pavlin Radoslavov [Mon, 7 Aug 2017 18:17:28 +0000 (18:17 +0000)]
Use a mutex to protect the scheduling of tBTA_PM_TIMER
am:
a8ba0bd7c8
Change-Id: Id221742b47d96bcf0d4e80ce83a9e7b3cb02940c
Pavlin Radoslavov [Mon, 7 Aug 2017 18:17:21 +0000 (18:17 +0000)]
Use a mutex to protect the scheduling of tBTA_PM_TIMER am:
9e702a6aef am:
a6ba2c3c0a
am:
c68fce56d0
Change-Id: I5d95919b21c8c1ecd24595105967d20cf947206a
johnshamoon [Mon, 7 Aug 2017 18:13:55 +0000 (18:13 +0000)]
Merge "test_vendor: Add Iterator tests" am:
c427c0bd30 am:
ef20e0dbb8 am:
4bdb823460
am:
a8744c2cfc
Change-Id: Ie55ba2a04f640369346ff4c89907f8cb1b37bb63
Pavlin Radoslavov [Mon, 7 Aug 2017 18:13:45 +0000 (18:13 +0000)]
Use a mutex to protect the scheduling of tBTA_PM_TIMER am:
9e702a6aef
am:
a6ba2c3c0a
Change-Id: Ifc72953b703d4203b5271a922a64802a9d27e255
Pavlin Radoslavov [Mon, 7 Aug 2017 18:09:44 +0000 (18:09 +0000)]
Use a mutex to protect the scheduling of tBTA_PM_TIMER
am:
9e702a6aef
Change-Id: I4f41eee8b9e5dd129b3aeffb287a6e8b9c7269c4
johnshamoon [Mon, 7 Aug 2017 18:09:40 +0000 (18:09 +0000)]
Merge "test_vendor: Add Iterator tests" am:
c427c0bd30 am:
ef20e0dbb8
am:
4bdb823460
Change-Id: Ic5fd2a95a9177f8abd1628d5addfab3b87b7bf05
Pavlin Radoslavov [Sun, 6 Aug 2017 06:47:50 +0000 (23:47 -0700)]
Use a mutex to protect the scheduling of tBTA_PM_TIMER
Bug:
63689331
Test: Code compilation
Change-Id: If062f7b3e2c17cb5a1ac2c8ef0813a2fe5c5a5f5
johnshamoon [Mon, 7 Aug 2017 17:58:19 +0000 (17:58 +0000)]
Merge "test_vendor: Add Iterator tests" am:
c427c0bd30
am:
ef20e0dbb8
Change-Id: I17f91bc17978fc21f68d464c5b7c6df979ecbccb
johnshamoon [Mon, 7 Aug 2017 17:55:20 +0000 (17:55 +0000)]
Merge "test_vendor: Add Iterator tests"
am:
c427c0bd30
Change-Id: I81d51453b88f707463b140861dfd0b6e0dcefb50
Treehugger Robot [Mon, 7 Aug 2017 17:42:41 +0000 (17:42 +0000)]
Merge "test_vendor: Add Iterator tests"
Pavlin Radoslavov [Sun, 6 Aug 2017 06:47:50 +0000 (23:47 -0700)]
Use a mutex to protect the scheduling of tBTA_PM_TIMER
Bug:
63689331
Test: Code compilation
Change-Id: If062f7b3e2c17cb5a1ac2c8ef0813a2fe5c5a5f5
(cherry picked from commit
a34d33ff2a3fe3562c1e003d870a0716f83568bf)
Pavlin Radoslavov [Fri, 4 Aug 2017 22:21:01 +0000 (22:21 +0000)]
Protect the btif config state with a lock during cleanup am:
ecadb0d01d
am:
bc9514658e
Change-Id: I426060e8b54ac053545e39b76813ad79ec83df38
Pavlin Radoslavov [Fri, 4 Aug 2017 22:20:31 +0000 (22:20 +0000)]
Protect the btif config state with a lock during cleanup am:
ecadb0d01d
am:
6de527247e
Change-Id: I82a101d7dced93e4e1bbaa4edd262f04eec7b000
johnshamoon [Fri, 4 Aug 2017 22:14:32 +0000 (22:14 +0000)]
test_vendor: Use Custom Iterators in L2CAP Classes am:
6f1401153f am:
590df2b3f1 am:
6acf4aacf5
am:
f3c1d04aeb
Change-Id: If96ac50ffb63500a21020a7e09fec1fd13293d76
OSDN Git Service
