OSDN Git Service

android-x86/system-bt.git
7 years agoFix asterisks in block quotes am: ee96a3c60f am: 06cb439bd4 am: d08ffdff66
Myles Watson [Thu, 1 Dec 2016 22:53:12 +0000 (22:53 +0000)]
Fix asterisks in block quotes am: ee96a3c60f am: 06cb439bd4 am: d08ffdff66
am: 41b2dee61a

Change-Id: Id32e4e68174eaae160ac87f4c63504b7a13fe3d3

7 years agoFix asterisks in block quotes am: ee96a3c60f am: 06cb439bd4
Myles Watson [Thu, 1 Dec 2016 22:40:09 +0000 (22:40 +0000)]
Fix asterisks in block quotes am: ee96a3c60f am: 06cb439bd4
am: d08ffdff66

Change-Id: Ib2a4f701fd4f3589e19f9fc0308433eeb85eb3d0

7 years agoFix asterisks in block quotes am: ee96a3c60f
Myles Watson [Thu, 1 Dec 2016 22:35:10 +0000 (22:35 +0000)]
Fix asterisks in block quotes am: ee96a3c60f
am: 06cb439bd4

Change-Id: I779db96b212eb200ab4035c8ff0757c2e52e23f9

7 years agoFix asterisks in block quotes
Myles Watson [Thu, 1 Dec 2016 22:30:09 +0000 (22:30 +0000)]
Fix asterisks in block quotes
am: ee96a3c60f

Change-Id: I3bf248c9dd9b28f7f18b55df4357489f4999f549

7 years agoembdrv: Fix include ordering before clang-format am: c7caa5066e am: 8d55e6263b am...
Myles Watson [Thu, 1 Dec 2016 21:05:50 +0000 (21:05 +0000)]
embdrv: Fix include ordering before clang-format am: c7caa5066e am: 8d55e6263b am: d10171c238
am: 692beef6e0

Change-Id: I1d45c5f4b7cb83097e07dc03016ab830cb2d3a37

7 years agoembdrv: Fix include ordering before clang-format am: c7caa5066e am: 8d55e6263b
Myles Watson [Thu, 1 Dec 2016 20:56:35 +0000 (20:56 +0000)]
embdrv: Fix include ordering before clang-format am: c7caa5066e am: 8d55e6263b
am: d10171c238

Change-Id: I91c8cf8ce405b7db58247c8b1878be88fa44f163

7 years agoembdrv: Fix include ordering before clang-format am: c7caa5066e
Myles Watson [Thu, 1 Dec 2016 20:51:06 +0000 (20:51 +0000)]
embdrv: Fix include ordering before clang-format am: c7caa5066e
am: 8d55e6263b

Change-Id: Ibe440d89eac98ae09be5ef32f49e1e801ec3ed1c

7 years agoembdrv: Fix include ordering before clang-format
Myles Watson [Thu, 1 Dec 2016 20:43:32 +0000 (20:43 +0000)]
embdrv: Fix include ordering before clang-format
am: c7caa5066e

Change-Id: I8af6aa03984d2283b213dbf320e5d0751a94edf6

7 years agoImprove HOGP input report error handling am: 21c4b16bf3 -s ours
Lawrance Liu [Thu, 1 Dec 2016 20:11:10 +0000 (20:11 +0000)]
Improve HOGP input report error handling am: 21c4b16bf3  -s ours
am: eed94e23d2

Change-Id: I09520c4b36cbf8d9c936e6aba31127c3f4aec1e5

7 years agoFix asterisks in block quotes
Myles Watson [Wed, 23 Nov 2016 22:49:54 +0000 (14:49 -0800)]
Fix asterisks in block quotes

Remove double asterisks from block quotes.

git grep -lP '^[*][*]'  | xargs  sed 's/^[*][*]/ \*/' -i

Fix asterisk line lengths

 git grep -l '^[ /][*]\{79,\}[*/]' | \
   xargs sed -i s,"^\([ /]\)[*]\([*]\{78\}\)[*]*\([*/]\)","\1\2\3",

Test: mma -j32
Change-Id: Ie3fd375ac2f804cb0f53bf1314a005e85973b3d7

7 years agoembdrv: Fix include ordering before clang-format
Myles Watson [Tue, 29 Nov 2016 17:40:47 +0000 (09:40 -0800)]
embdrv: Fix include ordering before clang-format

clang-format re-orders #include statements.  Fix the includes
so that order is less important.

Test: mma -j32

Change-Id: Ia548c2c7d5669e0e759b3c5e7fa12a1ec48cc03e

7 years agoImprove HOGP input report error handling
Lawrance Liu [Thu, 1 Dec 2016 20:05:16 +0000 (20:05 +0000)]
Improve HOGP input report error handling
am: 21c4b16bf3  -s ours

Change-Id: I6bbc6240eabc281c734cc76d5d345bcd3c04f60e

7 years agoImprove HOGP input report error handling
Lawrance Liu [Tue, 4 Oct 2016 08:09:15 +0000 (16:09 +0800)]
Improve HOGP input report error handling

This fixes com.android.bluetooth crash when receiving HOGP input report
for unknown characteristic.

Test: Pair/Unpair BLE mouse/keyboard devices.
(cherry picked from commit 9e6f5ad992060fe91dbacc302417a30ddf5e7a57)
Bug: 33257618
Change-Id: I4bb3fb02cffdcc5b1273f8ace281826eccce6639

7 years agoRemove more usages of UINT_TO_PTR macro am: 531fe1a8c1 am: 4d73abae1b am: 8f62429099
Ajay Panicker [Thu, 1 Dec 2016 03:22:46 +0000 (03:22 +0000)]
Remove more usages of UINT_TO_PTR macro am: 531fe1a8c1 am: 4d73abae1b am: 8f62429099
am: 146d7657d6

Change-Id: Iaa7fa93af5fc2665dc337d00c0e24af3f9e516b0

7 years agoRemove more usages of UINT_TO_PTR macro am: 531fe1a8c1 am: 4d73abae1b
Ajay Panicker [Thu, 1 Dec 2016 03:11:53 +0000 (03:11 +0000)]
Remove more usages of UINT_TO_PTR macro am: 531fe1a8c1 am: 4d73abae1b
am: 8f62429099

Change-Id: I5aa9d8e3f74b62fb8d2b2921e09610e0f7298067

7 years agoRemove more usages of UINT_TO_PTR macro am: 531fe1a8c1
Ajay Panicker [Thu, 1 Dec 2016 03:02:15 +0000 (03:02 +0000)]
Remove more usages of UINT_TO_PTR macro am: 531fe1a8c1
am: 4d73abae1b

Change-Id: I101446c09308275ebfa06718f38fcbf9c2ad82e4

7 years agoRemove more usages of UINT_TO_PTR macro
Ajay Panicker [Thu, 1 Dec 2016 02:57:15 +0000 (02:57 +0000)]
Remove more usages of UINT_TO_PTR macro
am: 531fe1a8c1

Change-Id: I93895d5e6aa42d0ec75a9c69df9121e542b57e86

7 years agoRemove more usages of UINT_TO_PTR macro
Ajay Panicker [Tue, 22 Nov 2016 21:28:43 +0000 (13:28 -0800)]
Remove more usages of UINT_TO_PTR macro

Bug: 32995283
Test: Sanity tests with a carkit and a headset
Change-Id: Ie74ece4814499f771eb1f229558de7df5c726180

7 years agoMerge "Add a missing error check when processing AVDT_RECONFIG_CFM_EVT event" am...
Pavlin Radoslavov [Wed, 30 Nov 2016 20:27:21 +0000 (20:27 +0000)]
Merge "Add a missing error check when processing AVDT_RECONFIG_CFM_EVT event" am: 845623f07e am: c9c6d7066e am: 3e3a35abe6
am: 0ce8523718

Change-Id: I912530c6acc59a6f45f04d640548be00646aab06

7 years agoMerge "Add a missing error check when processing AVDT_RECONFIG_CFM_EVT event" am...
Pavlin Radoslavov [Wed, 30 Nov 2016 20:21:20 +0000 (20:21 +0000)]
Merge "Add a missing error check when processing AVDT_RECONFIG_CFM_EVT event" am: 845623f07e am: c9c6d7066e
am: 3e3a35abe6

Change-Id: Iabe352bb1961e3b0a788403479cfaf7b91b6d56b

7 years agoMerge "Add a missing error check when processing AVDT_RECONFIG_CFM_EVT event" am...
Pavlin Radoslavov [Wed, 30 Nov 2016 20:16:19 +0000 (20:16 +0000)]
Merge "Add a missing error check when processing AVDT_RECONFIG_CFM_EVT event" am: 845623f07e
am: c9c6d7066e

Change-Id: I33b5dcd2294eb48ae573cb650ae847007e7015c7

7 years agoMerge "Add a missing error check when processing AVDT_RECONFIG_CFM_EVT event"
Pavlin Radoslavov [Wed, 30 Nov 2016 20:10:43 +0000 (20:10 +0000)]
Merge "Add a missing error check when processing AVDT_RECONFIG_CFM_EVT event"
am: 845623f07e

Change-Id: I5f34508a6762023f93893886e62430513e21f2b2

7 years agoMerge "Add a missing error check when processing AVDT_RECONFIG_CFM_EVT event"
Treehugger Robot [Wed, 30 Nov 2016 19:49:44 +0000 (19:49 +0000)]
Merge "Add a missing error check when processing AVDT_RECONFIG_CFM_EVT event"

7 years agoRun clang-format on every commit am: b42db6400f am: 7dc0ccc434 am: eba84303be
Myles Watson [Wed, 30 Nov 2016 18:51:45 +0000 (18:51 +0000)]
Run clang-format on every commit am: b42db6400f am: 7dc0ccc434 am: eba84303be
am: 3de57b42a7

Change-Id: I9ab3302b4ed9e48033658172746d8f51c81697f7

7 years agoRun clang-format on every commit am: b42db6400f am: 7dc0ccc434
Myles Watson [Wed, 30 Nov 2016 18:45:44 +0000 (18:45 +0000)]
Run clang-format on every commit am: b42db6400f am: 7dc0ccc434
am: eba84303be

Change-Id: Ide60ccb4da95bb285a30400d2f750a3ec9de7a9a

7 years agoRun clang-format on every commit am: b42db6400f
Myles Watson [Wed, 30 Nov 2016 18:41:13 +0000 (18:41 +0000)]
Run clang-format on every commit am: b42db6400f
am: 7dc0ccc434

Change-Id: Id4f6d22f0b36206aed5e4c510dd85cea0443765a

7 years agoRun clang-format on every commit
Myles Watson [Wed, 30 Nov 2016 18:35:54 +0000 (18:35 +0000)]
Run clang-format on every commit
am: b42db6400f

Change-Id: I26e77b2d66154d5e9206dae2a9cceb7b6e6bf6e5

7 years agoAdd a missing error check when processing AVDT_RECONFIG_CFM_EVT event
Pavlin Radoslavov [Mon, 28 Nov 2016 22:32:40 +0000 (14:32 -0800)]
Add a missing error check when processing AVDT_RECONFIG_CFM_EVT event

Bug: 33114181
Test: Code compilation
Change-Id: Ic2d432b651ea80af2b0ff40fdb61221b0fc31f82

7 years agoRun clang-format on every commit
Myles Watson [Tue, 29 Nov 2016 18:58:00 +0000 (10:58 -0800)]
Run clang-format on every commit

Test: repo upload --cbr .
Change-Id: Ib4bea4649320db8890399dda8a285bab69f4b482

7 years agoCleanup GATT cache when remote device is disconnected am: a86618a954 -s ours
Jakub Pawlowski [Wed, 30 Nov 2016 03:22:16 +0000 (03:22 +0000)]
Cleanup GATT cache when remote device is disconnected am: a86618a954  -s ours
am: 5c574c8441

Change-Id: I0616b9bb4adbf1520353d266dfedd48373026d88

7 years agoCleanup GATT cache when remote device is disconnected
Jakub Pawlowski [Wed, 30 Nov 2016 02:46:45 +0000 (02:46 +0000)]
Cleanup GATT cache when remote device is disconnected
am: a86618a954  -s ours

Change-Id: I161874ad6e0418d1a59b77a036ee3e7fc374a2cd

7 years agoMerge "AVRCP: Fix get metadata attribute responses" am: 376dfb8071 am: f3317ac215...
Jack He [Wed, 30 Nov 2016 01:53:44 +0000 (01:53 +0000)]
Merge "AVRCP: Fix get metadata attribute responses" am: 376dfb8071 am: f3317ac215 am: 84d5fca040
am: 2b65c78796

Change-Id: Ie7dd6163df2c8a0b278774d353f385fbcb8c3566

7 years agoMerge "AVRCP: Fix get metadata attribute responses" am: 376dfb8071 am: f3317ac215
Jack He [Wed, 30 Nov 2016 01:48:13 +0000 (01:48 +0000)]
Merge "AVRCP: Fix get metadata attribute responses" am: 376dfb8071 am: f3317ac215
am: 84d5fca040

Change-Id: Ic7aa8361b101ef92df9d2f35d37f76a252d102a4

7 years agoMerge "Add Bluetooth device address parameter to HF Client APIs" am: 00a022cbef am...
Sanket Agarwal [Wed, 30 Nov 2016 01:43:21 +0000 (01:43 +0000)]
Merge "Add Bluetooth device address parameter to HF Client APIs" am: 00a022cbef am: c153e514db am: 709c5354cd
am: 53352e157f

Change-Id: Ifdb7b3b05475431e35fa46a804971bbbe02f18b3

7 years agoMerge "AVRCP: Fix get metadata attribute responses" am: 376dfb8071
Jack He [Wed, 30 Nov 2016 01:43:11 +0000 (01:43 +0000)]
Merge "AVRCP: Fix get metadata attribute responses" am: 376dfb8071
am: f3317ac215

Change-Id: I78be76890510b0e6167890a22c81709d4bd1afb5

7 years agoMerge "Add Bluetooth device address parameter to HF Client APIs" am: 00a022cbef am...
Sanket Agarwal [Wed, 30 Nov 2016 01:38:48 +0000 (01:38 +0000)]
Merge "Add Bluetooth device address parameter to HF Client APIs" am: 00a022cbef am: c153e514db
am: 709c5354cd

Change-Id: I11f035899fb3e13aed74340dcd61e42844a55352

7 years agoMerge "AVRCP: Fix get metadata attribute responses"
Jack He [Wed, 30 Nov 2016 01:38:41 +0000 (01:38 +0000)]
Merge "AVRCP: Fix get metadata attribute responses"
am: 376dfb8071

Change-Id: I2890fc0fd14dfced01702a4dad30020e0222cf18

7 years agoMerge "Add Bluetooth device address parameter to HF Client APIs" am: 00a022cbef
Sanket Agarwal [Wed, 30 Nov 2016 01:33:51 +0000 (01:33 +0000)]
Merge "Add Bluetooth device address parameter to HF Client APIs" am: 00a022cbef
am: c153e514db

Change-Id: I47556ea02e4acf14593aa22b5f7485954efc1602

7 years agoMerge "AVRCP: Fix get metadata attribute responses"
Treehugger Robot [Wed, 30 Nov 2016 01:31:20 +0000 (01:31 +0000)]
Merge "AVRCP: Fix get metadata attribute responses"

7 years agoMerge "Add Bluetooth device address parameter to HF Client APIs"
Sanket Agarwal [Wed, 30 Nov 2016 01:28:50 +0000 (01:28 +0000)]
Merge "Add Bluetooth device address parameter to HF Client APIs"
am: 00a022cbef

Change-Id: If717859f243fa737a6487fe6b595320e08ed31c8

7 years agoMerge "Add Bluetooth device address parameter to HF Client APIs"
Sanket Agarwal [Wed, 30 Nov 2016 01:23:42 +0000 (01:23 +0000)]
Merge "Add Bluetooth device address parameter to HF Client APIs"

7 years agoCleanup GATT cache when remote device is disconnected am: 9580a30918 am: c7684d288d...
Jakub Pawlowski [Wed, 30 Nov 2016 00:14:36 +0000 (00:14 +0000)]
Cleanup GATT cache when remote device is disconnected am: 9580a30918 am: c7684d288d am: 7aed5cc802
am: 2b978b75e9

Change-Id: I18dd44493bb56db6b1aee3caf8ac5ac45dc1651d

7 years agoCleanup GATT cache when remote device is disconnected am: 9580a30918 am: c7684d288d
Jakub Pawlowski [Wed, 30 Nov 2016 00:09:06 +0000 (00:09 +0000)]
Cleanup GATT cache when remote device is disconnected am: 9580a30918 am: c7684d288d
am: 7aed5cc802

Change-Id: I1fd81771b3fdd4952fcb40d26f4b082024995d2d

7 years agoCleanup GATT cache when remote device is disconnected am: 9580a30918
Jakub Pawlowski [Wed, 30 Nov 2016 00:03:36 +0000 (00:03 +0000)]
Cleanup GATT cache when remote device is disconnected am: 9580a30918
am: c7684d288d

Change-Id: I3b9bd745db1854cbeb6a742788d8aa2fb7d30255

7 years agoCleanup GATT cache when remote device is disconnected
Jakub Pawlowski [Tue, 29 Nov 2016 19:45:09 +0000 (11:45 -0800)]
Cleanup GATT cache when remote device is disconnected

According to Bluetooth spec, GATT cache should not be persisted between
reconnections for unbonded devices. Bonded devices store the cache on
the disk and will read it on reconnection.

Bug: 33123476
Test: sl4a GattReadTest
Change-Id: If2ca53c7b22a346e7236514ea7b461695c923f74
(cherry picked from commit 9580a30918c256cf20fdb68823115864155e6243)

7 years agoCleanup GATT cache when remote device is disconnected
Jakub Pawlowski [Tue, 29 Nov 2016 23:58:40 +0000 (23:58 +0000)]
Cleanup GATT cache when remote device is disconnected
am: 9580a30918

Change-Id: I41d6b37b9cec3917c79bb89b8f03ff7912a49ece

7 years agoMask out HFP 1.7 feature bits if peer version is <1.7 am: ebba3ef2ea am: c5bae32779...
Andre Eisenbach [Tue, 29 Nov 2016 22:59:08 +0000 (22:59 +0000)]
Mask out HFP 1.7 feature bits if peer version is <1.7 am: ebba3ef2ea am: c5bae32779  -s ours am: 808e0899e5
am: 22aada3038  -s ours

Change-Id: Iba610f386cce7e36a41ab89878cb6ce81b61b861

7 years agoMask out HFP 1.7 feature bits if peer version is <1.7 am: ebba3ef2ea am: c5bae32779...
Andre Eisenbach [Tue, 29 Nov 2016 22:53:34 +0000 (22:53 +0000)]
Mask out HFP 1.7 feature bits if peer version is <1.7 am: ebba3ef2ea am: c5bae32779  -s ours
am: 808e0899e5

Change-Id: I0dec188620f7793bc85fca571386d8f8471fb8d8

7 years agoMask out HFP 1.7 feature bits if peer version is <1.7 am: ebba3ef2ea
Andre Eisenbach [Tue, 29 Nov 2016 22:48:12 +0000 (22:48 +0000)]
Mask out HFP 1.7 feature bits if peer version is <1.7 am: ebba3ef2ea
am: c5bae32779  -s ours

Change-Id: I7a6408ea19b0d5663ca321e276d9629c81a4f12d

7 years agoDO NOT MERGE ANYWHERE Auto Connection Parameter Update for Whitelisted Address am...
Jacky Cheung [Tue, 29 Nov 2016 22:32:43 +0000 (22:32 +0000)]
DO NOT MERGE ANYWHERE Auto Connection Parameter Update for Whitelisted Address am: eac369fc17  -s ours am: f144de2774  -s ours
am: 55ea8b2653  -s ours

Change-Id: I6ef3f681bb76d1e5c1be20ee1aa8bd3e99251f8e

7 years agoDO NOT MERGE ANYWHERE LE Connection Parameter Update Callback am: f4314979ba -s...
Jacky Cheung [Tue, 29 Nov 2016 22:32:39 +0000 (22:32 +0000)]
DO NOT MERGE ANYWHERE LE Connection Parameter Update Callback am: f4314979ba  -s ours am: fc89e4e3be  -s ours
am: 11863b7f8a  -s ours

Change-Id: I67ec2ee1c4a79e731ffbd2e0572d2d0e5683b59b

7 years agoFix random crashes in HID related code am: e318faa73a am: 1fe98c51ab -s ours am...
Jakub Pawlowski [Tue, 29 Nov 2016 22:32:25 +0000 (22:32 +0000)]
Fix random crashes in HID related code am: e318faa73a am: 1fe98c51ab  -s ours am: 559f688b76
am: 744fc6eda9

Change-Id: Ibb0b7d21157a022179e9516a04148f6995d18df1

7 years agoDO NOT MERGE ANYWHERE Auto Connection Parameter Update for Whitelisted Address am...
Jacky Cheung [Tue, 29 Nov 2016 22:27:38 +0000 (22:27 +0000)]
DO NOT MERGE ANYWHERE Auto Connection Parameter Update for Whitelisted Address am: eac369fc17  -s ours
am: f144de2774  -s ours

Change-Id: Ie68c473b64be32c95fc615b5b99a5c11175a8ac7

7 years agoDO NOT MERGE ANYWHERE LE Connection Parameter Update Callback am: f4314979ba -s...
Jacky Cheung [Tue, 29 Nov 2016 22:27:35 +0000 (22:27 +0000)]
DO NOT MERGE ANYWHERE LE Connection Parameter Update Callback am: f4314979ba  -s ours
am: fc89e4e3be  -s ours

Change-Id: Ia17670f3f302fbada8750736c32ec8e08c8663eb

7 years agoFix random crashes in HID related code am: e318faa73a am: 1fe98c51ab -s ours
Jakub Pawlowski [Tue, 29 Nov 2016 22:27:24 +0000 (22:27 +0000)]
Fix random crashes in HID related code am: e318faa73a am: 1fe98c51ab  -s ours
am: 559f688b76

Change-Id: Ic3fda82fd407945cfa7da4592e3189e4072d02a3

7 years agoDO NOT MERGE ANYWHERE Auto Connection Parameter Update for Whitelisted Address
Jacky Cheung [Tue, 29 Nov 2016 22:22:23 +0000 (22:22 +0000)]
DO NOT MERGE ANYWHERE Auto Connection Parameter Update for Whitelisted Address
am: eac369fc17  -s ours

Change-Id: I963c759985843377184346f6dcd5b7116acc0077

7 years agoDO NOT MERGE ANYWHERE LE Connection Parameter Update Callback
Jacky Cheung [Tue, 29 Nov 2016 22:22:21 +0000 (22:22 +0000)]
DO NOT MERGE ANYWHERE LE Connection Parameter Update Callback
am: f4314979ba  -s ours

Change-Id: I16af3e5f66c62959ae572dbd57a8ad8c21b772ff

7 years agoFix random crashes in HID related code am: e318faa73a
Jakub Pawlowski [Tue, 29 Nov 2016 22:22:08 +0000 (22:22 +0000)]
Fix random crashes in HID related code am: e318faa73a
am: 1fe98c51ab  -s ours

Change-Id: I95da5f44c95f27d9b6ab6b9c329cf93910796e48

7 years agoAdd Bluetooth device address parameter to HF Client APIs
Sanket Agarwal [Mon, 28 Nov 2016 23:46:29 +0000 (15:46 -0800)]
Add Bluetooth device address parameter to HF Client APIs

Bug: 30984220
Test: SL4A tests for HFP

Change-Id: I62cb69b4296e1b5bdf951ccfafc55433f1ea0a1a

7 years agoCleanup GATT cache when remote device is disconnected
Jakub Pawlowski [Tue, 29 Nov 2016 19:45:09 +0000 (11:45 -0800)]
Cleanup GATT cache when remote device is disconnected

According to Bluetooth spec, GATT cache should not be persisted between
reconnections for unbonded devices. Bonded devices store the cache on
the disk and will read it on reconnection.

Bug: 33123476
Test: sl4a GattReadTest
Change-Id: If2ca53c7b22a346e7236514ea7b461695c923f74

7 years agoAVRCP: Fix get metadata attribute responses
Jack He [Sun, 20 Nov 2016 01:08:28 +0000 (17:08 -0800)]
AVRCP: Fix get metadata attribute responses

* Add checks for remaining buffer capacity to handle long metadata
* Change the attribute number max to AVRC_MAX_NUM_MEDIA_ATTR_ID
* Consolidate attribute value filling code between GetElementAttributes
  and GetItemAttributes
* Check requested media attribute IDs before building response

Bug: 3240725033001066
Test: manual - connect to carkit and play music, see metadata and hear audio
Change-Id: I8f0c47148be35100202398c754861abb1fb9def1

7 years agoreadability fix: No assigns in if conditionals am: f33b6f434f am: 769d8fa541 am:...
Marie Janssen [Mon, 28 Nov 2016 21:26:35 +0000 (21:26 +0000)]
readability fix: No assigns in if conditionals am: f33b6f434f am: 769d8fa541 am: aee1e33601
am: d47e06f3d6

Change-Id: Iadd79c52b6bf9478e7dc70b3e063176cec37be9e

7 years agoreadability fix: No assigns in if conditionals am: f33b6f434f am: 769d8fa541
Marie Janssen [Mon, 28 Nov 2016 21:17:46 +0000 (21:17 +0000)]
readability fix: No assigns in if conditionals am: f33b6f434f am: 769d8fa541
am: aee1e33601

Change-Id: I2201dcc51a56b9f2ed90d6d5abcf218dd61bbb1f

7 years agoreadability fix: No assigns in if conditionals am: f33b6f434f
Marie Janssen [Mon, 28 Nov 2016 21:09:24 +0000 (21:09 +0000)]
readability fix: No assigns in if conditionals am: f33b6f434f
am: 769d8fa541

Change-Id: I4207f71bf0e482ce1dec299c804d0569e79ff79f

7 years agoreadability fix: No assigns in if conditionals
Marie Janssen [Mon, 28 Nov 2016 21:01:53 +0000 (21:01 +0000)]
readability fix: No assigns in if conditionals
am: f33b6f434f

Change-Id: I11c5af715b2ad86f33491fae7a5bd530f07a2e96

7 years agoreadability fix: No assigns in if conditionals
Marie Janssen [Tue, 22 Nov 2016 23:01:42 +0000 (15:01 -0800)]
readability fix: No assigns in if conditionals

Coccinelle-assisted:
@@
variable i;
expression E;
statement S1, S2;
@@

+ i = E;
  if (
(
-   (i = E)
+   i
    != ...
|
-   (i = E)
+   i
    == ...
|
-   (i = E)
+   i
    < ...
|
-   (i = E)
+   i
    > ...
|
-   (i = E)
+   i
    <= ...
|
-   (i = E)
+   i
    >= ...
|
-   (i = E)
+   i
)
    ) S1 else S2

for file in $(find . -name "*.cc"); do
  spatch --sp no-if-assigns.cocci --in-place $file
done

clang-format --style=file -i bta/**/*.cc

Test: mma -j37 and basic sanity testing on angler, sailfish

Change-Id: I41a2964afac347c24e13869b6c172e321e646091

7 years agoMerge "Fix an inappropriate NULL-pointer check in handle_rc_passthrough_cmd" am:...
Marie Janssen [Mon, 28 Nov 2016 17:09:11 +0000 (17:09 +0000)]
Merge "Fix an inappropriate NULL-pointer check in handle_rc_passthrough_cmd" am: 9f0cc0803c am: 43e7d69946 am: 807d696d03
am: a49234f772

Change-Id: I491915e3074e66b5efc9999bb758f232c89961ec

7 years agoMerge "Fix an inappropriate NULL-pointer check in handle_rc_passthrough_cmd" am:...
Marie Janssen [Mon, 28 Nov 2016 17:06:07 +0000 (17:06 +0000)]
Merge "Fix an inappropriate NULL-pointer check in handle_rc_passthrough_cmd" am: 9f0cc0803c am: 43e7d69946
am: 807d696d03

Change-Id: Iffc5422f3daae61051fa46fbaab38b5ef5da8c25

7 years agoMerge "Fix an inappropriate NULL-pointer check in handle_rc_passthrough_cmd" am:...
Marie Janssen [Mon, 28 Nov 2016 17:02:07 +0000 (17:02 +0000)]
Merge "Fix an inappropriate NULL-pointer check in handle_rc_passthrough_cmd" am: 9f0cc0803c
am: 43e7d69946

Change-Id: I74c1098f11c0c1a6e3e48f5c7d56da650100ede2

7 years agoMerge "Fix an inappropriate NULL-pointer check in handle_rc_passthrough_cmd"
Marie Janssen [Mon, 28 Nov 2016 16:58:06 +0000 (16:58 +0000)]
Merge "Fix an inappropriate NULL-pointer check in handle_rc_passthrough_cmd"
am: 9f0cc0803c

Change-Id: I3532ac2520edb3f5845ad36549bde71a566aaba0

7 years agoMerge "Fix an inappropriate NULL-pointer check in handle_rc_passthrough_cmd"
Marie Janssen [Mon, 28 Nov 2016 16:51:08 +0000 (16:51 +0000)]
Merge "Fix an inappropriate NULL-pointer check in handle_rc_passthrough_cmd"

7 years agoMerge "Fix x86_64 compilation on Ubuntu 14.04" am: a4338e32c9 am: 3e7fe75f48 am:...
Jack He [Thu, 24 Nov 2016 06:05:41 +0000 (06:05 +0000)]
Merge "Fix x86_64 compilation on Ubuntu 14.04" am: a4338e32c9 am: 3e7fe75f48 am: 237f83cacc
am: b04ccfba1d

Change-Id: I44d91111ccd58e650e56c830334589da82137ec4

7 years agoMerge "Fix x86_64 compilation on Ubuntu 14.04" am: a4338e32c9 am: 3e7fe75f48
Jack He [Thu, 24 Nov 2016 06:03:05 +0000 (06:03 +0000)]
Merge "Fix x86_64 compilation on Ubuntu 14.04" am: a4338e32c9 am: 3e7fe75f48
am: 237f83cacc

Change-Id: Ic4f08a3703fdf746162cffc93ac04f6e49e38531

7 years agoMerge "Fix x86_64 compilation on Ubuntu 14.04" am: a4338e32c9
Jack He [Thu, 24 Nov 2016 06:01:04 +0000 (06:01 +0000)]
Merge "Fix x86_64 compilation on Ubuntu 14.04" am: a4338e32c9
am: 3e7fe75f48

Change-Id: Ib50f669253b4b159b0511bda5093ee3143b6a7ba

7 years agoMerge "Fix x86_64 compilation on Ubuntu 14.04"
Jack He [Thu, 24 Nov 2016 05:58:35 +0000 (05:58 +0000)]
Merge "Fix x86_64 compilation on Ubuntu 14.04"
am: a4338e32c9

Change-Id: Ibba0d7622b417595b7b0234263c675ff57f47c8d

7 years agoMerge "Fix x86_64 compilation on Ubuntu 14.04"
Treehugger Robot [Thu, 24 Nov 2016 05:54:57 +0000 (05:54 +0000)]
Merge "Fix x86_64 compilation on Ubuntu 14.04"

7 years agoMerge changes I9ebb32f0,I00393e2b am: a9bfdf980f am: 6a1e9995a9 am: 74e4e4b303
Myles Watson [Thu, 24 Nov 2016 03:36:14 +0000 (03:36 +0000)]
Merge changes I9ebb32f0,I00393e2b am: a9bfdf980f am: 6a1e9995a9 am: 74e4e4b303
am: 9955212a62

Change-Id: I99073cebf28559e62626b6dfb72783b88157d866

7 years agoFix formatting after removing defines am: 9008888d24 am: 7413f94c6f am: 6ff3e65656
Myles Watson [Thu, 24 Nov 2016 03:36:09 +0000 (03:36 +0000)]
Fix formatting after removing defines am: 9008888d24 am: 7413f94c6f am: 6ff3e65656
am: a83a584c4c

Change-Id: Icb52eed25563768b68dc9fb8482b5e4f03ab78a2

7 years agoRemove BTA_GATT_INCLUDED am: 9979121f08 am: f6dc423c99 am: 813880af5e
Myles Watson [Thu, 24 Nov 2016 03:36:05 +0000 (03:36 +0000)]
Remove BTA_GATT_INCLUDED am: 9979121f08 am: f6dc423c99 am: 813880af5e
am: 1de8e7a891

Change-Id: I89a94345cc9dc063308b239fcaaf0e630eb4b459

7 years agoMerge changes I9ebb32f0,I00393e2b am: a9bfdf980f am: 6a1e9995a9
Myles Watson [Thu, 24 Nov 2016 03:34:04 +0000 (03:34 +0000)]
Merge changes I9ebb32f0,I00393e2b am: a9bfdf980f am: 6a1e9995a9
am: 74e4e4b303

Change-Id: I3a011f6c98fa1dbda00152d2567db9c68f7db0ed

7 years agoFix formatting after removing defines am: 9008888d24 am: 7413f94c6f
Myles Watson [Thu, 24 Nov 2016 03:34:00 +0000 (03:34 +0000)]
Fix formatting after removing defines am: 9008888d24 am: 7413f94c6f
am: 6ff3e65656

Change-Id: Ic0562ab869a421a54215f74378c6c9253908e45f

7 years agoRemove BTA_GATT_INCLUDED am: 9979121f08 am: f6dc423c99
Myles Watson [Thu, 24 Nov 2016 03:33:56 +0000 (03:33 +0000)]
Remove BTA_GATT_INCLUDED am: 9979121f08 am: f6dc423c99
am: 813880af5e

Change-Id: I4dbc17498fd279a157293bad3fa952aa9dca9257

7 years agoMerge changes I9ebb32f0,I00393e2b am: a9bfdf980f
Myles Watson [Thu, 24 Nov 2016 03:31:32 +0000 (03:31 +0000)]
Merge changes I9ebb32f0,I00393e2b am: a9bfdf980f
am: 6a1e9995a9

Change-Id: Ibc5ea1e948a790a2dcd419a7185a415af84ff2a4

7 years agoFix formatting after removing defines am: 9008888d24
Myles Watson [Thu, 24 Nov 2016 03:31:29 +0000 (03:31 +0000)]
Fix formatting after removing defines am: 9008888d24
am: 7413f94c6f

Change-Id: I78f6253c2c3697cd12e21eb6f30f79b6570570e5

7 years agoRemove BTA_GATT_INCLUDED am: 9979121f08
Myles Watson [Thu, 24 Nov 2016 03:31:24 +0000 (03:31 +0000)]
Remove BTA_GATT_INCLUDED am: 9979121f08
am: f6dc423c99

Change-Id: I1277d2d00f4c477bff7656ebc232ccbba4d3c953

7 years agoMerge changes I9ebb32f0,I00393e2b
Myles Watson [Thu, 24 Nov 2016 03:28:59 +0000 (03:28 +0000)]
Merge changes I9ebb32f0,I00393e2b
am: a9bfdf980f

Change-Id: Ia3988047f5869db610602e821a504d6038359079

7 years agoFix formatting after removing defines
Myles Watson [Thu, 24 Nov 2016 03:28:58 +0000 (03:28 +0000)]
Fix formatting after removing defines
am: 9008888d24

Change-Id: I1eb41520b1434fd99d6459384e7ed1e7b0050984

7 years agoRemove BTA_GATT_INCLUDED
Myles Watson [Thu, 24 Nov 2016 03:28:55 +0000 (03:28 +0000)]
Remove BTA_GATT_INCLUDED
am: 9979121f08

Change-Id: Ie0ad2741c407eabbfbf1a26100a73dc115aa9b93

7 years agoMerge changes I9ebb32f0,I00393e2b
Treehugger Robot [Thu, 24 Nov 2016 03:24:51 +0000 (03:24 +0000)]
Merge changes I9ebb32f0,I00393e2b

* changes:
  Fix formatting after removing defines
  Remove BTA_GATT_INCLUDED

7 years agoFix a unit test failure related to SBC maxbitpool testing am: 29a0f792cd am: f8044ce9...
Pavlin Radoslavov [Thu, 24 Nov 2016 02:44:03 +0000 (02:44 +0000)]
Fix a unit test failure related to SBC maxbitpool testing am: 29a0f792cd am: f8044ce96a am: 2696899797
am: 099362ebfa

Change-Id: I3469621921207877531816887ed9f627e5eb9a12

7 years agoFix a unit test failure related to SBC maxbitpool testing am: 29a0f792cd am: f8044ce96a
Pavlin Radoslavov [Thu, 24 Nov 2016 02:41:21 +0000 (02:41 +0000)]
Fix a unit test failure related to SBC maxbitpool testing am: 29a0f792cd am: f8044ce96a
am: 2696899797

Change-Id: I7a1cd29ef55ce6407090e2d12db78100248c2dc4

7 years agoFix a unit test failure related to SBC maxbitpool testing am: 29a0f792cd
Pavlin Radoslavov [Thu, 24 Nov 2016 02:39:21 +0000 (02:39 +0000)]
Fix a unit test failure related to SBC maxbitpool testing am: 29a0f792cd
am: f8044ce96a

Change-Id: I786d2306e850d6ba7fbbdfcc0ee4d28d2b8227f1

7 years agoFix a unit test failure related to SBC maxbitpool testing
Pavlin Radoslavov [Thu, 24 Nov 2016 02:36:51 +0000 (02:36 +0000)]
Fix a unit test failure related to SBC maxbitpool testing
am: 29a0f792cd

Change-Id: I0df5b12f7c4866c9c40adad9a14ab70d637b8e2b

7 years agoFix x86_64 compilation on Ubuntu 14.04
Jack He [Tue, 22 Nov 2016 20:39:52 +0000 (12:39 -0800)]
Fix x86_64 compilation on Ubuntu 14.04

* Add necessary includes in bt_trace.h
* Add toolchain specific configs
* Add libc++ import for clang
* Add libc++abi include for clang
* Add ipc_handler_linux.cc in service/BUILD.gn
* Use shared_mutex when _LIBCPP_VERSION < 3500
* Updated the build instructions

Test: ninja -C out/Default
Change-Id: I362ebf33f62910be817339cc6bdc62830f57db30

7 years agoFix an inappropriate NULL-pointer check in handle_rc_passthrough_cmd
liuchao [Wed, 23 Nov 2016 08:21:01 +0000 (16:21 +0800)]
Fix an inappropriate NULL-pointer check in handle_rc_passthrough_cmd

This fixes a potential NULL-pointer access in case p_remote_cmd is NULL

Test: mm -j 8
Change-Id: I06ae9afb9ae161296828e06b2c00d921189bee5c

7 years agoFix a unit test failure related to SBC maxbitpool testing
Pavlin Radoslavov [Thu, 24 Nov 2016 00:36:14 +0000 (16:36 -0800)]
Fix a unit test failure related to SBC maxbitpool testing

The unit test failure was introduced / overlooked by an earlier CL.

Test: running "test/run_unit_tests.sh net_test_stack"
Change-Id: I40824a903a0dbef3bdab965ef5c390a8939cc5ee

7 years agoRemove SMP_INCLUDED define am: 2e8e9f4213 am: 8a94420f7d am: 17178729e0
Myles Watson [Wed, 23 Nov 2016 18:45:34 +0000 (18:45 +0000)]
Remove SMP_INCLUDED define am: 2e8e9f4213 am: 8a94420f7d am: 17178729e0
am: 2a3cd5cc34

Change-Id: I580c0999b216cd26ee983baf1a3ce4a3977ad949

7 years agoRemove BLE_INCLUDED define am: 84baa7f16e am: a4b8fc803b am: da39c46cca
Myles Watson [Wed, 23 Nov 2016 18:45:32 +0000 (18:45 +0000)]
Remove BLE_INCLUDED define am: 84baa7f16e am: a4b8fc803b am: da39c46cca
am: c32dbc0bdb

Change-Id: Ie00143e8f86e9a5216d932834cb8d976b0e65310

7 years agoRemove SMP_INCLUDED define am: 2e8e9f4213 am: 8a94420f7d
Myles Watson [Wed, 23 Nov 2016 18:40:48 +0000 (18:40 +0000)]
Remove SMP_INCLUDED define am: 2e8e9f4213 am: 8a94420f7d
am: 17178729e0

Change-Id: I75c4155a39cc7ae335e99149599f1927e58cfb9a

7 years agoRemove BLE_INCLUDED define am: 84baa7f16e am: a4b8fc803b
Myles Watson [Wed, 23 Nov 2016 18:40:45 +0000 (18:40 +0000)]
Remove BLE_INCLUDED define am: 84baa7f16e am: a4b8fc803b
am: da39c46cca

Change-Id: I4508a91f639fc2dd6411392a56e5003f393fc7c5