OSDN Git Service
Ivan Lozano [Thu, 6 Dec 2018 00:38:35 +0000 (16:38 -0800)]
Merge "Enable bounds sanitization in Bluetooth." am:
ec74937aa0 am:
ffd2e4684b
am:
d3b2b05194
Change-Id: Ibaa0ece672974adb35b8781c443d48892e043608
Ivan Lozano [Thu, 6 Dec 2018 00:11:43 +0000 (16:11 -0800)]
Merge "Enable bounds sanitization in Bluetooth." am:
ec74937aa0
am:
ffd2e4684b
Change-Id: I0ab2bdd59ac82843e4e807e91e5237c905dce99a
Ivan Lozano [Wed, 5 Dec 2018 23:58:50 +0000 (15:58 -0800)]
Merge "Enable bounds sanitization in Bluetooth."
am:
ec74937aa0
Change-Id: Ie1a58ea6002a2ce5ba36d9a5ca870a6db1fc4614
Ivan Lozano [Wed, 5 Dec 2018 23:38:16 +0000 (23:38 +0000)]
Merge "Enable bounds sanitization in Bluetooth."
Srinu Jella [Wed, 5 Dec 2018 22:43:47 +0000 (14:43 -0800)]
Merge "Group BR-EDR related SDP variables under transport" am:
1068f028e1 am:
080e937008
am:
03ce0fbad4
Change-Id: Iddc534fdae7a9d74ca5f9e2c804f8090a0732ede
Srinu Jella [Wed, 5 Dec 2018 22:39:14 +0000 (14:39 -0800)]
Merge "Group BR-EDR related SDP variables under transport" am:
1068f028e1
am:
080e937008
Change-Id: I34def9279e8d4ca4d20e054387bd67ba772cd481
Srinu Jella [Wed, 5 Dec 2018 22:30:51 +0000 (14:30 -0800)]
Merge "Group BR-EDR related SDP variables under transport"
am:
1068f028e1
Change-Id: Idb6f348ffea7350cbc6ae8e9fbf24938d8f6a2c9
Treehugger Robot [Wed, 5 Dec 2018 22:04:09 +0000 (22:04 +0000)]
Merge "Group BR-EDR related SDP variables under transport"
TreeHugger Robot [Wed, 5 Dec 2018 08:40:23 +0000 (08:40 +0000)]
Merge "Fix OOB in process_l2cap_cmd"
Jack He [Wed, 5 Dec 2018 02:25:01 +0000 (18:25 -0800)]
Metrics: Fix a typo in log am:
015dd9392f am:
ff61d33a86
am:
05a83062e2
Change-Id: I03440e6a879514a0f1efa6a90b31a6c6ef471e5c
Jack He [Wed, 5 Dec 2018 02:20:56 +0000 (18:20 -0800)]
Metrics: Fix a typo in log am:
015dd9392f
am:
ff61d33a86
Change-Id: Ie893a70b38dd8a26e25190c694bf5b205cff64e1
Jack He [Wed, 5 Dec 2018 02:15:51 +0000 (18:15 -0800)]
Metrics: Fix a typo in log
am:
015dd9392f
Change-Id: Ib15c2fad51eb1569dfa9589fc39bb7595ed2c5bc
TreeHugger Robot [Wed, 5 Dec 2018 02:07:32 +0000 (02:07 +0000)]
Merge "Fix possible OOB when receive SMP data"
Jack He [Tue, 4 Dec 2018 22:30:28 +0000 (14:30 -0800)]
Metrics: Fix a typo in log
Test: make
Change-Id: I92a49c62ebf13d8da7f13b39c426d0eb14a83db6
Srinu Jella [Thu, 11 Feb 2016 14:17:39 +0000 (19:47 +0530)]
Group BR-EDR related SDP variables under transport
Use Case: Random RNR initiated after HOGP Keyboard disconnection
steps:
1. keep madcatz in advertisement mode and scan, pair from DUT.
2. keep dailog Keyboard in advertisement mode and scan, pair from DUT.
3. Take Keyboard out of range to initiate disconnection from remote
or initiate disconnection from remote.
Failure: DUT trying to do RNR to random device.
Root Cause: when the disconnection happened for LE device, it sets
the wait_disc to true, that is causing random RNR to go for BR-EDR
device.
Fix: Group all BR-EDR related SDP variables under transport check
so that if some other operation on LE will not corrupt these BR-EDR
variables to mislead.
Test: code compilation.
Bug:
69031582
Change-Id: Ic9003f2b85bbaaa30b201b8a639a9d9b52055ac5
Jakub Pawlowski [Tue, 4 Dec 2018 11:19:54 +0000 (03:19 -0800)]
Split Timer into OnceTimer and RepeatingTimer am:
5cf0304979 am:
51de60ce31
am:
ef8b143e49
Change-Id: I0ab31466ba69868673d9ad7ca3ee7f7093c9b231
Jakub Pawlowski [Tue, 4 Dec 2018 10:55:54 +0000 (02:55 -0800)]
Split Timer into OnceTimer and RepeatingTimer am:
5cf0304979
am:
51de60ce31
Change-Id: I90fa25a2d9bae98429a8486e5b74799d6b2537d5
Jakub Pawlowski [Tue, 4 Dec 2018 10:42:23 +0000 (02:42 -0800)]
Split Timer into OnceTimer and RepeatingTimer
am:
5cf0304979
Change-Id: Ie3d704b95231953a8cb602cc0b279a94a6f8081a
Jakub Pawlowski [Mon, 3 Dec 2018 15:50:40 +0000 (16:50 +0100)]
Split Timer into OnceTimer and RepeatingTimer
Follow the naming convention in libbase, where Callback was split into
OnceCallback, and RepeatingCallback, to make it obvious how many times
callback is expected to be called.
Test: unit tests were split from TimerTest into OnceTimerTest and
RepeatingTimerTest
Bug:
110303473
Change-Id: Ibbb9bb74a2e6e1a0f0f74c6ec44f63c5a4a1537f
Jack He [Sat, 1 Dec 2018 00:24:11 +0000 (16:24 -0800)]
Test: Save SSR dump after test am:
268b88c948 am:
6e814aaa7d
am:
1eab7e418e
Change-Id: I815a7d551cbfe6a0036b69b06183cb4f4b0f0cd5
Jack He [Sat, 1 Dec 2018 00:20:25 +0000 (16:20 -0800)]
Test: Save SSR dump after test am:
268b88c948
am:
6e814aaa7d
Change-Id: I8f482dd5e4a97779b64b23c22bfa14fe05617978
Jack He [Sat, 1 Dec 2018 00:17:05 +0000 (16:17 -0800)]
Test: Save SSR dump after test
am:
268b88c948
Change-Id: I34ae79fdf0fcdb246d8be40970b785d9dee92e9b
Ugo Yu [Fri, 30 Nov 2018 21:49:29 +0000 (13:49 -0800)]
Add OOB check in avrc_pars_browse_rsp am:
f44cbb20e7 am:
45a3f8a6fd am:
845fc7c234 am:
f7d26fe477
am:
8429b3df50
Change-Id: I98e65d6379e8ab13ba41e73c7f3c4cad32e6535b
Ugo Yu [Fri, 30 Nov 2018 21:39:23 +0000 (13:39 -0800)]
Add OOB check in avrc_pars_browse_rsp am:
f44cbb20e7 am:
45a3f8a6fd am:
845fc7c234
am:
f7d26fe477
Change-Id: I18e346ddf845ea055610457effb51437b6bb8fec
Ugo Yu [Fri, 30 Nov 2018 21:27:11 +0000 (13:27 -0800)]
Add OOB check in avrc_pars_browse_rsp am:
f44cbb20e7 am:
45a3f8a6fd
am:
845fc7c234
Change-Id: I4e6e5da28d3aaa25c9f5522385ae098b4c8362cc
Ugo Yu [Fri, 30 Nov 2018 21:23:05 +0000 (13:23 -0800)]
Add OOB check in avrc_pars_browse_rsp am:
f44cbb20e7
am:
45a3f8a6fd
Change-Id: Ibb3ff9d8915ab9129e890b04848dd78891262e28
Ugo Yu [Fri, 30 Nov 2018 21:13:52 +0000 (13:13 -0800)]
Add OOB check in avrc_pars_browse_rsp
am:
f44cbb20e7
Change-Id: Ieabff141ded21319a946fa0829bdb60cdedd8e9b
Jack He [Fri, 30 Nov 2018 00:51:22 +0000 (16:51 -0800)]
Test: Save SSR dump after test
* Save SSR dump from /data/vendor/ssrdump after test invocation
Bug:
120098494
Test: atest :postsubmit
Change-Id: Iafc1666c8cc9fbc7f69b909be630b3d0c1445fe4
Ugo Yu [Tue, 13 Nov 2018 12:03:28 +0000 (20:03 +0800)]
Add OOB check in avrc_pars_browse_rsp
Bug:
111451066
Test: Manully
Change-Id: I068d218b8957bb8f053148d252a9119a8def28cc
Jack He [Fri, 30 Nov 2018 09:16:09 +0000 (01:16 -0800)]
Merge "Metrics: Add Bluetooth address obfuscator" am:
17d56d8962 am:
14b03ef16c
am:
f5ea2d685b
Change-Id: I5a1ecff1d72e52527e9cdc8443b6c6979690bb12
Chienyuan [Fri, 30 Nov 2018 09:08:22 +0000 (17:08 +0800)]
Fix OOB in process_l2cap_cmd
Bug:
111215173
Test: manual
Change-Id: I98c122fea64cb33a9b0986254685091bcc8a951b
Jack He [Fri, 30 Nov 2018 08:56:45 +0000 (00:56 -0800)]
Merge "Metrics: Add Bluetooth address obfuscator" am:
17d56d8962
am:
14b03ef16c
Change-Id: Ib9300993c257b2b8814dbab3aa476af40da9941e
Stanley Tng [Fri, 30 Nov 2018 08:43:48 +0000 (00:43 -0800)]
Merge "Assert if alarm callback is null" am:
dec5621902 am:
14f7e98eeb
am:
54fe977827
Change-Id: I39b1a597d85112f1c59b91c0e25f4881a3a840d5
Stanley Tng [Fri, 30 Nov 2018 08:39:02 +0000 (00:39 -0800)]
Merge "Assert if alarm callback is null" am:
dec5621902
am:
14f7e98eeb
Change-Id: I46dbff26e2c350adeb19eb4efce36feed78d0b7f
Jack He [Fri, 30 Nov 2018 08:37:43 +0000 (00:37 -0800)]
Merge "Metrics: Add Bluetooth address obfuscator"
am:
17d56d8962
Change-Id: I02e0c1a734e55ead434c7e0b3a1696a03eaa027d
Stanley Tng [Fri, 30 Nov 2018 08:19:30 +0000 (00:19 -0800)]
Merge "Assert if alarm callback is null"
am:
dec5621902
Change-Id: I4241a172b6245bd7fdb4837c494882b8ea03416f
Treehugger Robot [Fri, 30 Nov 2018 07:59:20 +0000 (07:59 +0000)]
Merge "Metrics: Add Bluetooth address obfuscator"
Treehugger Robot [Fri, 30 Nov 2018 01:58:17 +0000 (01:58 +0000)]
Merge "Assert if alarm callback is null"
Jack He [Fri, 16 Nov 2018 10:59:43 +0000 (02:59 -0800)]
Metrics: Add Bluetooth address obfuscator
* Add an address obfuscator that takes a 256-bit randomly generated
salt and hashes a Bluetooth MAC address using HMAC-SHA256 algorithm
* The salt is generated per Android device during the first time
Fluoride native layer is initialized after a connectivity reset
* The output of the above operation is an unique identifier for a
Bluetooth device on the same Android device, but yet remains
anonymous across different Android devices.
* Add a logging method loghex(std::array) that allows dumping integral
arrays into a hex string
* Add more error logging to btif_config_get_bin() so that we know why it
fails in the future
* Change mutex in btif_config to recursive_mutex to avoid deadlock when
calling btif_config API functions with API function
Bug:
112969790
Test: mm -j40, bluetooth_test_common
Change-Id: I11f01cc82fe805c97fd7c86ad83b3d324ee5af53
Stanley Tng [Mon, 26 Nov 2018 22:44:38 +0000 (14:44 -0800)]
Assert if alarm callback is null
Crash the system when callback is null. This will help to identify and debug the problem. Previously, we got a CFI crash which is hard to isolate.
Test: Run with Hearing Aids but did not simulate the error condition
Bug:
119533256
Change-Id: I9bc2af7c3c405bea3a57c5feb9b213614484507f
Jakub Pawlowski [Thu, 29 Nov 2018 13:53:30 +0000 (05:53 -0800)]
[automerger skipped] [automerger] Fix buffer overflow in btif_dm_data_copy am:
d117975904 am:
12d8535d0f am:
98ced409a5 am:
c75667da96 skipped:
89e9bbb83c am:
2f53d6ce3c -s ours am:
9eac53f263 -s ours am:
8e403606f1 -s ours am:
6b408d20b7 -s ours
am:
4776388ed4 -s ours
Change-Id: Ic4e2d8ff0f0d7b492f1fbe86a3e3792298a900f2
Jakub Pawlowski [Thu, 29 Nov 2018 13:49:26 +0000 (05:49 -0800)]
[automerger skipped] [automerger] Fix buffer overflow in btif_dm_data_copy am:
d117975904 am:
12d8535d0f am:
98ced409a5 am:
c75667da96 skipped:
89e9bbb83c am:
2f53d6ce3c -s ours am:
9eac53f263 -s ours am:
8e403606f1 -s ours
am:
6b408d20b7 -s ours
Change-Id: Ia9b372bba8528c6c9f34b6d5fc5a3bec900f4c98
Jakub Pawlowski [Thu, 29 Nov 2018 13:41:21 +0000 (05:41 -0800)]
[automerger skipped] [automerger] Fix buffer overflow in btif_dm_data_copy am:
d117975904 am:
12d8535d0f am:
98ced409a5 am:
c75667da96 skipped:
89e9bbb83c am:
2f53d6ce3c -s ours am:
9eac53f263 -s ours
am:
8e403606f1 -s ours
Change-Id: Ie3788a8388c6a2fb00969e3b56c0637be82dc092
Jakub Pawlowski [Thu, 29 Nov 2018 13:35:18 +0000 (05:35 -0800)]
[automerger skipped] [automerger] Fix buffer overflow in btif_dm_data_copy am:
d117975904 am:
12d8535d0f am:
98ced409a5 am:
c75667da96 skipped:
89e9bbb83c am:
2f53d6ce3c -s ours
am:
9eac53f263 -s ours
Change-Id: I2eed02578d152324e7aa9281e55c3066a4645b33
Jakub Pawlowski [Thu, 29 Nov 2018 13:31:11 +0000 (05:31 -0800)]
[automerger skipped] [automerger] Fix buffer overflow in btif_dm_data_copy am:
d117975904 am:
12d8535d0f am:
98ced409a5 am:
c75667da96 skipped:
89e9bbb83c
am:
2f53d6ce3c -s ours
Change-Id: If82ef8a6331a62d932eeb3dffaee577ee7d7ea25
Android Build Merger (Role) [Thu, 29 Nov 2018 11:52:36 +0000 (11:52 +0000)]
[automerger] Fix buffer overflow in btif_dm_data_copy am:
d117975904 am:
12d8535d0f am:
98ced409a5 am:
c75667da96 skipped:
89e9bbb83c
Change-Id: Ia431ddd5ad1d6ee86bd6edd1057372b8dbf51d3b
Android Build Merger (Role) [Thu, 29 Nov 2018 11:51:42 +0000 (11:51 +0000)]
[automerger] Fix buffer overflow in btif_dm_data_copy am:
d117975904 am:
12d8535d0f am:
98ced409a5 am:
c75667da96
Change-Id: I0e5f1348f27f0d9981f99cc0897f9dcc9f443bf3
Android Build Merger (Role) [Thu, 29 Nov 2018 11:51:39 +0000 (11:51 +0000)]
[automerger] Fix buffer overflow in btif_dm_data_copy am:
d117975904 am:
12d8535d0f am:
98ced409a5
Change-Id: I258a6e883061d68b24b30e17e03f72d2000e5f3f
Android Build Merger (Role) [Thu, 29 Nov 2018 11:51:37 +0000 (11:51 +0000)]
[automerger] Fix buffer overflow in btif_dm_data_copy am:
d117975904 am:
12d8535d0f
Change-Id: I22ea297e564616790fd7e916747cdcea25d2b068
Android Build Merger (Role) [Thu, 29 Nov 2018 11:51:34 +0000 (11:51 +0000)]
[automerger] Fix buffer overflow in btif_dm_data_copy am:
d117975904
Change-Id: Icbd5b31039dbf3016575f9d6d69b216d76564c96
Jakub Pawlowski [Tue, 27 Nov 2018 16:59:57 +0000 (17:59 +0100)]
Fix buffer overflow in btif_dm_data_copy
When we use a union, we should always define variables as the union type,
not as one of the field subtypes. If the latter is cast to the union type,
buffer overflow can happen.
Bug:
110166268
Test: compilation
Change-Id: I473c03b099ad5a326e7a3739f65efd33cf4775bd
Merged-In: I473c03b099ad5a326e7a3739f65efd33cf4775bd
Jakub Pawlowski [Thu, 29 Nov 2018 09:59:20 +0000 (01:59 -0800)]
[automerger skipped] Fix buffer overflow in btif_dm_data_copy am:
969b2df3a0 am:
1087c5291a -s ours am:
0dce8b5287 -s ours am:
469606d73e -s ours
am:
ee5217d536 -s ours
Change-Id: Iec53ac555fbb50f1499eb044f05c0457a4e8f1bb
Jakub Pawlowski [Thu, 29 Nov 2018 09:54:13 +0000 (01:54 -0800)]
[automerger skipped] Fix buffer overflow in btif_dm_data_copy am:
969b2df3a0 am:
1087c5291a -s ours am:
0dce8b5287 -s ours
am:
469606d73e -s ours
Change-Id: Ibb7aa6995d609a1393d83dff1fe3692d1352d5a6
Jakub Pawlowski [Thu, 29 Nov 2018 09:46:06 +0000 (01:46 -0800)]
[automerger skipped] Fix buffer overflow in btif_dm_data_copy am:
969b2df3a0 am:
1087c5291a -s ours
am:
0dce8b5287 -s ours
Change-Id: Ie4a34e3043f232105344fbe6060d175d502f92ee
Jakub Pawlowski [Thu, 29 Nov 2018 09:39:01 +0000 (01:39 -0800)]
[automerger skipped] Fix buffer overflow in btif_dm_data_copy am:
969b2df3a0
am:
1087c5291a -s ours
Change-Id: I40657cf9ce6ae8ffe3d2d568aaeb34668da84292
Jakub Pawlowski [Thu, 29 Nov 2018 09:33:56 +0000 (01:33 -0800)]
Fix buffer overflow in btif_dm_data_copy
am:
969b2df3a0
Change-Id: Icc0b739672cf0683edf9bfc5d8244b1ceb87a1b6
Jakub Pawlowski [Tue, 27 Nov 2018 17:22:22 +0000 (18:22 +0100)]
Fix buffer overflow in btif_dm_data_copy
When we use a union, we should always define variables as the union type,
not as one of the field subtypes. If the latter is cast to the union type,
buffer overflow can happen.
Bug:
110166268
Test: compilation
Change-Id: I473c03b099ad5a326e7a3739f65efd33cf4775bd
Merged-In: I473c03b099ad5a326e7a3739f65efd33cf4775bd
Jakub Pawlowski [Thu, 29 Nov 2018 01:07:48 +0000 (17:07 -0800)]
[automerger skipped] Fix buffer overflow in btif_dm_data_copy am:
64c6f33e7e -s ours am:
941cd93604 -s ours
am:
6ae21e1f73 -s ours
Change-Id: I9b0d9ca5b8320ed7f18bbc12ce7670a58a17d4ac
Jakub Pawlowski [Thu, 29 Nov 2018 01:00:42 +0000 (17:00 -0800)]
[automerger skipped] Fix buffer overflow in btif_dm_data_copy am:
64c6f33e7e -s ours
am:
941cd93604 -s ours
Change-Id: Ie589ca00cc181e250c563760f5b20803169b832c
Jakub Pawlowski [Thu, 29 Nov 2018 00:47:17 +0000 (16:47 -0800)]
[automerger skipped] Fix buffer overflow in btif_dm_data_copy
am:
64c6f33e7e -s ours
Change-Id: I9e2836c4af3225954fc27961431fcc79f96db072
Jakub Pawlowski [Wed, 28 Nov 2018 23:00:05 +0000 (15:00 -0800)]
[automerger skipped] Fix buffer overflow in btif_dm_data_copy am:
ea90417d99 -s ours
am:
80b0acb8eb -s ours
Change-Id: I15e775716f088ff9e1af56d6a52069119f99f7d6
Jakub Pawlowski [Wed, 28 Nov 2018 22:30:47 +0000 (14:30 -0800)]
[automerger skipped] Fix buffer overflow in btif_dm_data_copy
am:
ea90417d99 -s ours
Change-Id: Idf41fde0fc9fd67066c05f22f70493035b63fef0
Jakub Pawlowski [Tue, 27 Nov 2018 17:22:22 +0000 (18:22 +0100)]
Fix buffer overflow in btif_dm_data_copy
When we use a union, we should always define variables as the union type,
not as one of the field subtypes. If the latter is cast to the union type,
buffer overflow can happen.
Bug:
110166268
Test: compilation
Change-Id: I473c03b099ad5a326e7a3739f65efd33cf4775bd
Merged-In: I473c03b099ad5a326e7a3739f65efd33cf4775bd
Jakub Pawlowski [Wed, 28 Nov 2018 21:57:23 +0000 (13:57 -0800)]
Allow Resolvable Private Address into LE White List am:
eb976adf47 am:
c360868622
am:
750bb1424f
Change-Id: Ib4cf18f8862afc5701b03272b229c45e1564f829
Jakub Pawlowski [Wed, 28 Nov 2018 21:41:52 +0000 (13:41 -0800)]
Allow Resolvable Private Address into LE White List am:
eb976adf47
am:
c360868622
Change-Id: If05792fff362c7d4e79db45ff83d62a9c4939a59
Jakub Pawlowski [Wed, 28 Nov 2018 21:31:27 +0000 (13:31 -0800)]
Allow Resolvable Private Address into LE White List
am:
eb976adf47
Change-Id: I701e05e417ae2c30491660faaf9de97c3c07beb7
Jakub Pawlowski [Tue, 27 Nov 2018 17:22:22 +0000 (18:22 +0100)]
Fix buffer overflow in btif_dm_data_copy
When we use a union, we should always define variables as the union type,
not as one of the field subtypes. If the latter is cast to the union type,
buffer overflow can happen.
Bug:
110166268
Test: compilation
Change-Id: I473c03b099ad5a326e7a3739f65efd33cf4775bd
Merged-In: I473c03b099ad5a326e7a3739f65efd33cf4775bd
Jakub Pawlowski [Wed, 28 Nov 2018 20:48:40 +0000 (12:48 -0800)]
Centralize call to gatt_update_app_use_link_flag for GATT_Connect am:
8c2f8384a8 am:
0ed98b36cb
am:
e88a2f1d12
Change-Id: I6370205a4623000c88cf9db6e0f734953171c68f
TreeHugger Robot [Wed, 28 Nov 2018 20:46:27 +0000 (20:46 +0000)]
Merge "Fix buffer overflow in btif_dm_data_copy"
Jakub Pawlowski [Wed, 28 Nov 2018 20:13:42 +0000 (12:13 -0800)]
Centralize call to gatt_update_app_use_link_flag for GATT_Connect am:
8c2f8384a8
am:
0ed98b36cb
Change-Id: Ie6014af62b987ffbdf71bc8a2bb34fe3b3cfdca4
Jakub Pawlowski [Wed, 28 Nov 2018 19:55:18 +0000 (11:55 -0800)]
Centralize call to gatt_update_app_use_link_flag for GATT_Connect
am:
8c2f8384a8
Change-Id: Icb9fd21e6af43dc4d31afba64bd58655a8f6ff5a
Jakub Pawlowski [Thu, 15 Nov 2018 22:22:21 +0000 (23:22 +0100)]
Allow Resolvable Private Address into LE White List
When doing background connection, we don't want to put RPA into the
white list, as it might expire in 15 minutes.
For direct connect procedure, RPA is ok - the request times out after 30
seconds.
This patch moves address type check from the White List to the background
connection procedure. It is prepearation for handling direct connect
with white list.
Bug:
112827989
Test: sl4a GattConnectTest
Change-Id: I907ad44d1d255c9212ed58112bb8b99464e46f43
Jakub Pawlowski [Tue, 13 Nov 2018 17:31:08 +0000 (18:31 +0100)]
Centralize call to gatt_update_app_use_link_flag for GATT_Connect
Currently both code paths, doing direct and background connection, call
gatt_update_app_use_link_flag. Move this call to common code.
Bug:
112827989
Test: sl4a GattConnectTest
Change-Id: I5d55f6467ffca78ff785ecdad02dd049ea5481bf
weichinweng [Tue, 27 Nov 2018 09:18:28 +0000 (17:18 +0800)]
Fix possible OOB when receive SMP data
Bug:
111215315
Test: manual
Change-Id: I79886048f4ad24dbdbb86b039709301b77da7f2d
Jakub Pawlowski [Tue, 27 Nov 2018 21:43:23 +0000 (13:43 -0800)]
[automerger skipped] [automerger] Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am:
78508d2c2c am:
a236f16071 am:
3f5af0aa65 am:
12557bb999 skipped:
2470706409 am:
d2dd0bacbc -s ours am:
1062b94226 -s ours am:
54f6c84dfd -s ours am:
4f54a847d5 -s ours
am:
e02e314d86 -s ours
Change-Id: I6979ad75a7ab1a01ab87569deb07e5aad8823d05
Jakub Pawlowski [Tue, 27 Nov 2018 21:37:02 +0000 (13:37 -0800)]
[automerger skipped] [automerger] Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am:
78508d2c2c am:
a236f16071 am:
3f5af0aa65 am:
12557bb999 skipped:
2470706409 am:
d2dd0bacbc -s ours am:
1062b94226 -s ours am:
54f6c84dfd -s ours
am:
4f54a847d5 -s ours
Change-Id: I25fd7b09fed990b9178205bd013e2886d78889ca
Jakub Pawlowski [Tue, 27 Nov 2018 17:22:22 +0000 (18:22 +0100)]
Fix buffer overflow in btif_dm_data_copy
When we use a union, we should always define variables as the union type,
not as one of the field subtypes. If the latter is cast to the union type,
buffer overflow can happen.
Bug:
110166268
Test: compilation
Change-Id: I473c03b099ad5a326e7a3739f65efd33cf4775bd
Jakub Pawlowski [Tue, 27 Nov 2018 21:29:49 +0000 (13:29 -0800)]
[automerger skipped] [automerger] Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am:
78508d2c2c am:
a236f16071 am:
3f5af0aa65 am:
12557bb999 skipped:
2470706409 am:
d2dd0bacbc -s ours am:
1062b94226 -s ours
am:
54f6c84dfd -s ours
Change-Id: I4cb634d3c98dabfdc6f1d95f6c1ff348f954ddd4
Jakub Pawlowski [Tue, 27 Nov 2018 21:24:43 +0000 (13:24 -0800)]
[automerger skipped] [automerger] Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am:
78508d2c2c am:
a236f16071 am:
3f5af0aa65 am:
12557bb999 skipped:
2470706409 am:
d2dd0bacbc -s ours
am:
1062b94226 -s ours
Change-Id: Ic8bab7e79d802eca8efda8a613f83e465e2a4e81
Jakub Pawlowski [Tue, 27 Nov 2018 21:14:37 +0000 (13:14 -0800)]
[automerger skipped] [automerger] Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am:
78508d2c2c am:
a236f16071 am:
3f5af0aa65 am:
12557bb999 skipped:
2470706409
am:
d2dd0bacbc -s ours
Change-Id: If276bb160498a352e02bdb6231ac8fed8142aec4
Android Build Merger (Role) [Tue, 27 Nov 2018 20:09:16 +0000 (20:09 +0000)]
[automerger] Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am:
78508d2c2c am:
a236f16071 am:
3f5af0aa65 am:
12557bb999 skipped:
2470706409
Change-Id: Id4bfbba911ecb95c728e1daba294fefc9d1de4ce
Android Build Merger (Role) [Tue, 27 Nov 2018 16:47:48 +0000 (16:47 +0000)]
[automerger] Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am:
78508d2c2c am:
a236f16071 am:
3f5af0aa65 am:
12557bb999
Change-Id: I1ecbacc502b14733b0f4bd11b057763506b1fd95
Android Build Merger (Role) [Tue, 27 Nov 2018 16:47:45 +0000 (16:47 +0000)]
[automerger] Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am:
78508d2c2c am:
a236f16071 am:
3f5af0aa65
Change-Id: I98ae5ab9e24acd447c0c72835067db0bc7430371
Android Build Merger (Role) [Tue, 27 Nov 2018 16:47:42 +0000 (16:47 +0000)]
[automerger] Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am:
78508d2c2c am:
a236f16071
Change-Id: I8615cedf8b9192c46506c54934229089021fe101
Android Build Merger (Role) [Tue, 27 Nov 2018 16:47:40 +0000 (16:47 +0000)]
[automerger] Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am:
78508d2c2c
Change-Id: If8da202c56ee7deeb7aba67f59b19ef28466f6ae
Jakub Pawlowski [Tue, 20 Nov 2018 21:31:31 +0000 (22:31 +0100)]
Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm
Bug:
116222069
Test: compilation
Change-Id: Iebe2c500dfc2806ca321fdcd170e20c680619d4d
Merged-In: Iebe2c500dfc2806ca321fdcd170e20c680619d4d
Jakub Pawlowski [Tue, 27 Nov 2018 16:39:56 +0000 (08:39 -0800)]
Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am:
889efd5b91 am:
934213ef03 am:
6135f03864 am:
0b614505ea
am:
986df39397
Change-Id: I44a80c5a01496dabe9ebaa240185438bf81701d8
Jakub Pawlowski [Tue, 27 Nov 2018 16:35:41 +0000 (08:35 -0800)]
Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am:
889efd5b91 am:
934213ef03 am:
6135f03864
am:
0b614505ea
Change-Id: I45a9c30088070257424fc3089f6808b9b96bc7b7
Jakub Pawlowski [Tue, 27 Nov 2018 16:31:14 +0000 (08:31 -0800)]
Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am:
889efd5b91 am:
934213ef03
am:
6135f03864
Change-Id: I72d0554197d85b6d63b37c09e67083a21b98ef32
Jakub Pawlowski [Tue, 27 Nov 2018 16:23:09 +0000 (08:23 -0800)]
Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am:
889efd5b91
am:
934213ef03
Change-Id: Ic9ff7d53321c6c7b39f32dc043050f1467a1233d
Jakub Pawlowski [Tue, 27 Nov 2018 16:19:03 +0000 (08:19 -0800)]
Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm
am:
889efd5b91
Change-Id: If3ae150367def015874bebb60c2fca763f01133f
jonerlin [Mon, 26 Nov 2018 21:26:59 +0000 (13:26 -0800)]
Merge "HFP: support pause character "Comma" in acceptable dial digit string" into pi-dev am:
2cb7fadb95
am:
1f7d16ea4b
Change-Id: I86f30ce860d194cbff0d2c7d833417ed1fcaea09
jonerlin [Mon, 26 Nov 2018 21:23:02 +0000 (13:23 -0800)]
Merge "HFP: support pause character "Comma" in acceptable dial digit string" into pi-dev
am:
2cb7fadb95
Change-Id: If0c2fb56913c06483a5ac51e9f41e1063c62c924
TreeHugger Robot [Mon, 26 Nov 2018 21:10:41 +0000 (21:10 +0000)]
Merge "HFP: support pause character "Comma" in acceptable dial digit string" into pi-dev
Stanley Tng [Wed, 21 Nov 2018 21:45:27 +0000 (13:45 -0800)]
Merge "Prevent potential deadlock in Hearing Aids" am:
2fb03d8470 am:
35b7a921bf
am:
30c86824bf
Change-Id: I6ac9d48bdafc4d251a37632ea29dd9e98799793a
Benson Li [Wed, 21 Nov 2018 21:40:50 +0000 (13:40 -0800)]
Merge "HFP: Send caller ID in +CLIP command (3/4)" am:
0bcf573d91 am:
763e282d78
am:
646c14c828
Change-Id: Ib928906786b4412e7aff3e7b1e41ee4d1234d5c4
Stanley Tng [Wed, 21 Nov 2018 21:39:08 +0000 (13:39 -0800)]
Merge "Prevent potential deadlock in Hearing Aids" am:
2fb03d8470
am:
35b7a921bf
Change-Id: I8a93e3fa0d46fd30b4c9f326e08f710002e57722
Benson Li [Wed, 21 Nov 2018 21:23:36 +0000 (13:23 -0800)]
Merge "HFP: Send caller ID in +CLIP command (3/4)" am:
0bcf573d91
am:
763e282d78
Change-Id: Ib878dd4534d9ed2a287273f74cbde6eefc3961d7
Stanley Tng [Wed, 21 Nov 2018 21:03:03 +0000 (13:03 -0800)]
Merge "Prevent potential deadlock in Hearing Aids"
am:
2fb03d8470
Change-Id: Id16264dd2cd55ab730323ed0d95adde1cb88431a
Benson Li [Wed, 21 Nov 2018 20:57:56 +0000 (12:57 -0800)]
Merge "HFP: Send caller ID in +CLIP command (3/4)"
am:
0bcf573d91
Change-Id: Ib4d00ef1e727613a4363226115137f700464fe82