OSDN Git Service

android-x86/system-bt.git
7 years agoFix bad GATT client state machine state after successfull cache load am: f87953f1be...
Jakub Pawlowski [Tue, 4 Oct 2016 16:49:07 +0000 (16:49 +0000)]
Fix bad GATT client state machine state after successfull cache load am: f87953f1be am: 565ca33e21
am: 70931eade7

Change-Id: If08773d1f2fcf939a1ad1a18f53de790c44e10b5

7 years agoFix bad GATT client state machine state after successfull cache load am: f87953f1be
Jakub Pawlowski [Tue, 4 Oct 2016 16:47:09 +0000 (16:47 +0000)]
Fix bad GATT client state machine state after successfull cache load am: f87953f1be
am: 565ca33e21

Change-Id: I40d4f4d32ca87341f82fecb721f394e7caa0aa50

7 years agoFix bad GATT client state machine state after successfull cache load
Jakub Pawlowski [Tue, 4 Oct 2016 16:45:43 +0000 (16:45 +0000)]
Fix bad GATT client state machine state after successfull cache load
am: f87953f1be

Change-Id: If89361b40bd9abf0150afa4ac2af1b02366eafc7

7 years agoMerge "Fix bad GATT client state machine state after successfull cache load" am:...
Jakub Pawlowski [Tue, 4 Oct 2016 00:52:17 +0000 (00:52 +0000)]
Merge "Fix bad GATT client state machine state after successfull cache load" am: 69b916046d am: 0776cdf3e6 am: 42acb81619
am: 9abfc9c14a

Change-Id: I7c1e29f0ef2c63e61fa28286d1299576aa6c3373

7 years agoMerge "Fix bad GATT client state machine state after successfull cache load" am:...
Jakub Pawlowski [Tue, 4 Oct 2016 00:49:39 +0000 (00:49 +0000)]
Merge "Fix bad GATT client state machine state after successfull cache load" am: 69b916046d am: 0776cdf3e6
am: 42acb81619

Change-Id: Ia726080e38eb634668665b07e9bd4ea91b6ae340

7 years agoMerge "Fix bad GATT client state machine state after successfull cache load" am:...
Jakub Pawlowski [Tue, 4 Oct 2016 00:44:15 +0000 (00:44 +0000)]
Merge "Fix bad GATT client state machine state after successfull cache load" am: 69b916046d
am: 0776cdf3e6

Change-Id: I2094e041dc9d38c1ceb1ea5a649d62de16a9ae0a

7 years agoMerge "Fix bad GATT client state machine state after successfull cache load"
Jakub Pawlowski [Tue, 4 Oct 2016 00:41:45 +0000 (00:41 +0000)]
Merge "Fix bad GATT client state machine state after successfull cache load"
am: 69b916046d

Change-Id: Ib8fedecce74779755c2ebb285db6ca31b8714b68

7 years agoMerge "Fix bad GATT client state machine state after successfull cache load"
Jakub Pawlowski [Tue, 4 Oct 2016 00:38:14 +0000 (00:38 +0000)]
Merge "Fix bad GATT client state machine state after successfull cache load"

7 years agoReplace log/log.h with android/log.h am: 2f0c1fff33 am: 53dc5ba848 am: 7a3ec37304
Mark Salyzyn [Mon, 3 Oct 2016 23:03:13 +0000 (23:03 +0000)]
Replace log/log.h with android/log.h am: 2f0c1fff33 am: 53dc5ba848 am: 7a3ec37304
am: e53dd48d57

Change-Id: Id51dfaa86619020ed9e1a401c65ca10990525b51

7 years agoReplace log/log.h with android/log.h am: 2f0c1fff33 am: 53dc5ba848
Mark Salyzyn [Mon, 3 Oct 2016 22:57:31 +0000 (22:57 +0000)]
Replace log/log.h with android/log.h am: 2f0c1fff33 am: 53dc5ba848
am: 7a3ec37304

Change-Id: I49cd4f5249dc65c74cf828254f3191a017eb3ad2

7 years agoReplace log/log.h with android/log.h am: 2f0c1fff33
Mark Salyzyn [Mon, 3 Oct 2016 22:52:21 +0000 (22:52 +0000)]
Replace log/log.h with android/log.h am: 2f0c1fff33
am: 53dc5ba848

Change-Id: I1009dd3e5413e8c84608bc6e473cd4127fbd4f9e

7 years agoReplace log/log.h with android/log.h
Mark Salyzyn [Mon, 3 Oct 2016 22:48:20 +0000 (22:48 +0000)]
Replace log/log.h with android/log.h
am: 2f0c1fff33

Change-Id: I137539cc1f2cdeda6ceb6f7e4106fb379dc50555

7 years agoReplace log/log.h with android/log.h
Mark Salyzyn [Thu, 29 Sep 2016 16:16:01 +0000 (09:16 -0700)]
Replace log/log.h with android/log.h

Actually, remove reference, android logging is not used here.

Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I37731dc37f61c129f3440e5d9ff1d0e71fe193d0

7 years agoFix bad GATT client state machine state after successfull cache load
Jakub Pawlowski [Mon, 3 Oct 2016 20:25:01 +0000 (13:25 -0700)]
Fix bad GATT client state machine state after successfull cache load

If the GATT service cache was successfully loaded from a file, the
state must be reset to idle.

Bug: 31175159
Change-Id: I92ebf1bec9d2e7467d7412b41923614ec5a13b6d

7 years agoFix bad GATT client state machine state after successfull cache load
Jakub Pawlowski [Mon, 3 Oct 2016 20:25:01 +0000 (13:25 -0700)]
Fix bad GATT client state machine state after successfull cache load

If the GATT service cache was successfully loaded from a file, the
state must be reset to idle.

Bug: 31175159
Change-Id: I92ebf1bec9d2e7467d7412b41923614ec5a13b6d

7 years agotest_vendor: Refactor scheduling of dual_mode_controller event handling am: 3c4f59fc2...
Jorge E. Moreira [Mon, 3 Oct 2016 17:43:16 +0000 (17:43 +0000)]
test_vendor: Refactor scheduling of dual_mode_controller event handling am: 3c4f59fc27 am: 81f2249e94 am: f8626b0721
am: 13ff85fd90

Change-Id: If35e6439bb01d8586910556d195ddf1827a88f24

7 years agotest_vendor: Refactor scheduling of dual_mode_controller event handling am: 3c4f59fc2...
Jorge E. Moreira [Mon, 3 Oct 2016 17:37:49 +0000 (17:37 +0000)]
test_vendor: Refactor scheduling of dual_mode_controller event handling am: 3c4f59fc27 am: 81f2249e94
am: f8626b0721

Change-Id: I8bf88152127337435a7fa5330be45c610f30f65b

7 years agotest_vendor: Refactor scheduling of dual_mode_controller event handling am: 3c4f59fc27
Jorge E. Moreira [Mon, 3 Oct 2016 17:31:45 +0000 (17:31 +0000)]
test_vendor: Refactor scheduling of dual_mode_controller event handling am: 3c4f59fc27
am: 81f2249e94

Change-Id: I9e6660f68a78f200d00ccc8f895b59599901138a

7 years agotest_vendor: Refactor scheduling of dual_mode_controller event handling
Jorge E. Moreira [Mon, 3 Oct 2016 17:28:07 +0000 (17:28 +0000)]
test_vendor: Refactor scheduling of dual_mode_controller event handling
am: 3c4f59fc27

Change-Id: Ia9a9860a9744580349921a5d9cb0ad9771bdefaf

7 years agoRemove redundant logic from system/bt/bta am: e143d941d2 am: b9554aed8a am: 1a8056a222
Jack He [Sat, 1 Oct 2016 00:31:20 +0000 (00:31 +0000)]
Remove redundant logic from system/bt/bta am: e143d941d2 am: b9554aed8a am: 1a8056a222
am: 7e5163101a

Change-Id: I9a1a1a901d9efc6cdd4eb2f66ccbfaa82523ee4e

7 years agotest_vendor: Refactor scheduling of dual_mode_controller event handling
Jorge E. Moreira [Fri, 16 Sep 2016 23:50:41 +0000 (16:50 -0700)]
test_vendor: Refactor scheduling of dual_mode_controller event handling

Moved all controller actions out of read callbacks to task callbacks to
avoid race conditions when modifying internal controller state.

Change-Id: Ie8bb762992755db2dddb6b7bb6a4fe52ab2d0020

7 years agoRemove redundant logic from system/bt/bta am: e143d941d2 am: b9554aed8a
Jack He [Fri, 30 Sep 2016 22:02:55 +0000 (22:02 +0000)]
Remove redundant logic from system/bt/bta am: e143d941d2 am: b9554aed8a
am: 1a8056a222

Change-Id: I278f26b30e5e05391fb7920f57fe1d6149f9c7be

7 years agoRemove redundant logic from system/bt/bta am: e143d941d2
Jack He [Fri, 30 Sep 2016 21:55:26 +0000 (21:55 +0000)]
Remove redundant logic from system/bt/bta am: e143d941d2
am: b9554aed8a

Change-Id: Id26fd245bb90aeeee658a61adee595d30ef0ba15

7 years agoRemove redundant logic from system/bt/bta
Jack He [Fri, 30 Sep 2016 21:51:55 +0000 (21:51 +0000)]
Remove redundant logic from system/bt/bta
am: e143d941d2

Change-Id: I4fbe813cfa2809efd083cd36d567860fc7fe5ceb

7 years agoRemove redundant logic from system/bt/bta
Jack He [Fri, 30 Sep 2016 19:57:44 +0000 (12:57 -0700)]
Remove redundant logic from system/bt/bta

Bug: 31274290
Test: Manual
Change-Id: I5a4bff5e25b08a32709cdc81bac86a641d80f113

7 years agoMerge "Do not request remote name from non-connectable dev" am: 49109aefb0 am: 13e05a...
Kim Schulz [Fri, 30 Sep 2016 20:06:05 +0000 (20:06 +0000)]
Merge "Do not request remote name from non-connectable dev" am: 49109aefb0 am: 13e05a1959 am: 3ab83c181e
am: 3e8894f00c

Change-Id: I4bbe9358352a70647f4e447addae7e14f3a3fc7c

7 years agoMerge "Fix warnings of implicit function declaration in Linux vendor lib" am: c4c9923...
Patrick Tsai [Fri, 30 Sep 2016 20:05:53 +0000 (20:05 +0000)]
Merge "Fix warnings of implicit function declaration in Linux vendor lib" am: c4c9923724 am: feaf001c2d am: 7ed28e9b28
am: 4b6af8234c

Change-Id: I4b7f37713f9ddf3c32ffc11e71ab4cb7747a4fe3

7 years agoMerge "Do not request remote name from non-connectable dev" am: 49109aefb0 am: 13e05a1959
Kim Schulz [Fri, 30 Sep 2016 19:53:05 +0000 (19:53 +0000)]
Merge "Do not request remote name from non-connectable dev" am: 49109aefb0 am: 13e05a1959
am: 3ab83c181e

Change-Id: I206199b593ad932e6603ffe4e34322cdfb3295f7

7 years agoMerge "Do not request remote name from non-connectable dev" am: 49109aefb0
Kim Schulz [Fri, 30 Sep 2016 19:49:29 +0000 (19:49 +0000)]
Merge "Do not request remote name from non-connectable dev" am: 49109aefb0
am: 13e05a1959

Change-Id: Id6c15d6012a7a2d6edfbee1e24ef81fba25e93ac

7 years agoMerge "Fix warnings of implicit function declaration in Linux vendor lib" am: c4c9923...
Patrick Tsai [Fri, 30 Sep 2016 19:47:25 +0000 (19:47 +0000)]
Merge "Fix warnings of implicit function declaration in Linux vendor lib" am: c4c9923724 am: feaf001c2d
am: 7ed28e9b28

Change-Id: Ie041880ef40b5a0f5a873caa0332ba5b4da20aec

7 years agoMerge "Do not request remote name from non-connectable dev"
Kim Schulz [Fri, 30 Sep 2016 19:46:29 +0000 (19:46 +0000)]
Merge "Do not request remote name from non-connectable dev"
am: 49109aefb0

Change-Id: Iae4d72d5ed0c452085adf36b0c27daa61c45a8ae

7 years agoMerge "Fix warnings of implicit function declaration in Linux vendor lib" am: c4c9923724
Patrick Tsai [Fri, 30 Sep 2016 19:43:08 +0000 (19:43 +0000)]
Merge "Fix warnings of implicit function declaration in Linux vendor lib" am: c4c9923724
am: feaf001c2d

Change-Id: I18d5825d09aba13e37ece6e8b63b5087bd729d08

7 years agoMerge "Do not request remote name from non-connectable dev"
Treehugger Robot [Fri, 30 Sep 2016 19:40:53 +0000 (19:40 +0000)]
Merge "Do not request remote name from non-connectable dev"

7 years agoMerge "Fix warnings of implicit function declaration in Linux vendor lib"
Patrick Tsai [Fri, 30 Sep 2016 19:40:06 +0000 (19:40 +0000)]
Merge "Fix warnings of implicit function declaration in Linux vendor lib"
am: c4c9923724

Change-Id: I1d4d89be2d72f13e9bd5ae8b4b90856b21e3a0b9

7 years agoFix NULL pointer crash in send_at_cmd am: 5c8fa2b199 am: 907d1e9cdc am: 0df96a52b2
Sebastien Griffoul [Fri, 30 Sep 2016 19:34:08 +0000 (19:34 +0000)]
Fix NULL pointer crash in send_at_cmd am: 5c8fa2b199 am: 907d1e9cdc am: 0df96a52b2
am: 68a1a8ebc5

Change-Id: Id33882a0d26a3adcee08fe88339053beba591863

7 years agoMerge "Fix warnings of implicit function declaration in Linux vendor lib"
Treehugger Robot [Fri, 30 Sep 2016 19:33:46 +0000 (19:33 +0000)]
Merge "Fix warnings of implicit function declaration in Linux vendor lib"

7 years agoFix NULL pointer crash in send_at_cmd am: 5c8fa2b199 am: 907d1e9cdc
Sebastien Griffoul [Fri, 30 Sep 2016 19:14:53 +0000 (19:14 +0000)]
Fix NULL pointer crash in send_at_cmd am: 5c8fa2b199 am: 907d1e9cdc
am: 0df96a52b2

Change-Id: I575c15a4cc39000c494cb69ef1647d3161032a74

7 years agoFix NULL pointer crash in send_at_cmd am: 5c8fa2b199
Sebastien Griffoul [Fri, 30 Sep 2016 19:11:41 +0000 (19:11 +0000)]
Fix NULL pointer crash in send_at_cmd am: 5c8fa2b199
am: 907d1e9cdc

Change-Id: Iccd3eb172e6bdae93aab0dbf7724d5a73beba379

7 years agoFix NULL pointer crash in send_at_cmd
Sebastien Griffoul [Fri, 30 Sep 2016 19:08:42 +0000 (19:08 +0000)]
Fix NULL pointer crash in send_at_cmd
am: 5c8fa2b199

Change-Id: I64b04cbf63438f25e58b700a9af6fe1d51a3905b

7 years agoDo not request remote name from non-connectable dev
Kim Schulz [Fri, 29 Apr 2016 08:26:02 +0000 (10:26 +0200)]
Do not request remote name from non-connectable dev

if an LE device is found during an LE scan, the BT host will try to fetch its name (creating an LE
connection) even though the advertising report received indicates that it is a non-connectable
advertising.
This is pointless and should not happen.

Change-Id: I246e4795b4f4e33f3202908ebff3724e8e89523c

7 years agoFix warnings of implicit function declaration in Linux vendor lib
Patrick Tsai [Sat, 19 Mar 2016 04:12:34 +0000 (21:12 -0700)]
Fix warnings of implicit function declaration in Linux vendor lib

Change-Id: I482f1096e87966f33ba8584ea60188abab3bcc42

7 years agoFix NULL pointer crash in send_at_cmd
Sebastien Griffoul [Fri, 17 Oct 2014 10:14:19 +0000 (12:14 +0200)]
Fix NULL pointer crash in send_at_cmd

If the string argument of send_at_cmd is a null pointer,
then the function should not crash: indeed this is a valid
parameters which can be used to send an AT cmd which doesn't
require any extra parameter.

Test: trivial fix. Existing unit tests still pass.
Change-Id: I3d83eebed660d703cd5a93a19dc73f4f354ab7bf
Signed-off-by: Sebastien Griffoul <sebastien.griffoul@intel.com>
7 years agoEnable libbase logging for whole stack am: 75b83661ea am: 8d81059e2f am: 1f161a621d
Jakub Pawlowski [Fri, 30 Sep 2016 00:41:58 +0000 (00:41 +0000)]
Enable libbase logging for whole stack am: 75b83661ea am: 8d81059e2f am: 1f161a621d
am: d5ce1c4326

Change-Id: I94ef19e8b6715c3930639e860d498526995ad439

7 years agoEnable libbase logging for whole stack am: 75b83661ea am: 8d81059e2f
Jakub Pawlowski [Fri, 30 Sep 2016 00:25:53 +0000 (00:25 +0000)]
Enable libbase logging for whole stack am: 75b83661ea am: 8d81059e2f
am: 1f161a621d

Change-Id: If12246cb7f0a7ecc7814d8b70e543c6a2b1d883b

7 years agoEnable libbase logging for whole stack am: 75b83661ea
Jakub Pawlowski [Fri, 30 Sep 2016 00:24:21 +0000 (00:24 +0000)]
Enable libbase logging for whole stack am: 75b83661ea
am: 8d81059e2f

Change-Id: I7d89ff65ad5de2d0756cab4ffdb6cf77cf34b9ac

7 years agoEnable libbase logging for whole stack
Jakub Pawlowski [Fri, 30 Sep 2016 00:22:21 +0000 (00:22 +0000)]
Enable libbase logging for whole stack
am: 75b83661ea

Change-Id: Ic09c0c3bfefbad2e8949f29b9d36c8fa13b266ae

7 years agoEnable libbase logging for whole stack
Jakub Pawlowski [Wed, 28 Sep 2016 01:24:59 +0000 (18:24 -0700)]
Enable libbase logging for whole stack

Currently, only C++ code in the service/ folder can use libbase logging.
This patch makes sure that logging can be used and is properly
configured for usage when the stack is running as part of Bluetooth.apk.

Bug: 31806042
Change-Id: I1f8be79ba9999b53ece0b5217a893b4bd20ecafc

7 years agoMerge "Support TARGET_TRANSLATE_2ND_ARCH case" am: d09a76a935 am: b874d655ef am:...
Victor Khimenko [Thu, 29 Sep 2016 06:30:39 +0000 (06:30 +0000)]
Merge "Support TARGET_TRANSLATE_2ND_ARCH case" am: d09a76a935 am: b874d655ef am: f0105e5a76
am: 60954fb026

Change-Id: I76a080620e77e1bdd6c836808f8ab09ed9e86dc9

7 years agoMerge "Support TARGET_TRANSLATE_2ND_ARCH case" am: d09a76a935 am: b874d655ef
Victor Khimenko [Thu, 29 Sep 2016 06:26:54 +0000 (06:26 +0000)]
Merge "Support TARGET_TRANSLATE_2ND_ARCH case" am: d09a76a935 am: b874d655ef
am: f0105e5a76

Change-Id: I7486a2559590d1f9d3840ddaeb5f0ea62f643c4d

7 years agoMerge "Support TARGET_TRANSLATE_2ND_ARCH case" am: d09a76a935
Victor Khimenko [Thu, 29 Sep 2016 06:17:08 +0000 (06:17 +0000)]
Merge "Support TARGET_TRANSLATE_2ND_ARCH case" am: d09a76a935
am: b874d655ef

Change-Id: I9d091454c236d3f5bd6c3f96725869f2c563bbb0

7 years agoMerge "Support TARGET_TRANSLATE_2ND_ARCH case"
Victor Khimenko [Thu, 29 Sep 2016 06:13:07 +0000 (06:13 +0000)]
Merge "Support TARGET_TRANSLATE_2ND_ARCH case"
am: d09a76a935

Change-Id: Ib9c919256db089ed4ef859016d46ae8ec7791bdd

7 years agoMerge "Support TARGET_TRANSLATE_2ND_ARCH case"
Victor Khimenko [Thu, 29 Sep 2016 06:08:00 +0000 (06:08 +0000)]
Merge "Support TARGET_TRANSLATE_2ND_ARCH case"

7 years agoFix 100 LE device connection limitation am: 426da5ad3c am: 9856bc202b am: 302e9575d9
Andre Eisenbach [Thu, 29 Sep 2016 03:20:26 +0000 (03:20 +0000)]
Fix 100 LE device connection limitation am: 426da5ad3c am: 9856bc202b am: 302e9575d9
am: 0437668d9b

Change-Id: If1d21cc869ec2ab329c1a5ca87dcb89770942fbc

7 years agoFix 100 LE device connection limitation am: 426da5ad3c am: 9856bc202b
Andre Eisenbach [Thu, 29 Sep 2016 02:15:34 +0000 (02:15 +0000)]
Fix 100 LE device connection limitation am: 426da5ad3c am: 9856bc202b
am: 302e9575d9

Change-Id: Id03b9a333606ac01d7283fa7de0aa92d81c53fee

7 years agoFix 100 LE device connection limitation am: 426da5ad3c
Andre Eisenbach [Thu, 29 Sep 2016 02:05:21 +0000 (02:05 +0000)]
Fix 100 LE device connection limitation am: 426da5ad3c
am: 9856bc202b

Change-Id: Ieb9e1d2870574c8cf0efdf9fa86bed634db38c96

7 years agoFix 100 LE device connection limitation
Andre Eisenbach [Thu, 29 Sep 2016 02:02:20 +0000 (02:02 +0000)]
Fix 100 LE device connection limitation
am: 426da5ad3c

Change-Id: Ie9d7439eda57bfaeac544bc35f6100413b1fe354

7 years agoMerge commit '7e701dbd4375ee00c3b72d4bda970d444f20c470' into manual_merge_7e701db
Andre Eisenbach [Thu, 29 Sep 2016 00:44:51 +0000 (00:44 +0000)]
Merge commit '7e701dbd4375ee00c3b72d4bda970d444f20c470' into manual_merge_7e701db
am: e49037a792

Change-Id: Id4efe36644775f01f7197fc42e18a1983f1928fb

7 years agoMerge commit '7e701dbd4375ee00c3b72d4bda970d444f20c470' into manual_merge_7e701db
Andre Eisenbach [Thu, 29 Sep 2016 00:26:14 +0000 (17:26 -0700)]
Merge commit '7e701dbd4375ee00c3b72d4bda970d444f20c470' into manual_merge_7e701db

Change-Id: I12e74839725fe33e6739517e454a0941aa4bd986

7 years agoFix 100 LE device connection limitation
Andre Eisenbach [Wed, 28 Sep 2016 01:07:58 +0000 (18:07 -0700)]
Fix 100 LE device connection limitation

Currently after 100 devices are added to the device security database,
any subsequent LE connection to a newly discovered LE device address
will fail as entries in the security record database are not reused.

This patch removes a device record if the device itself is removed and
also ensures that the oldest device security record is deleted if the
limit is reached to ensure a new record can be allocated.

Bug: 31625900
Test: SL4A multi-device connection test + regression
Change-Id: I22f6c82c64a9a9bfb2a16d79182903e5aa011355
(cherry picked from commit 013c32bf98b8d511dc29fcd7de7578a421a52590)

7 years agoFix 100 LE device connection limitation
Andre Eisenbach [Wed, 28 Sep 2016 23:53:42 +0000 (23:53 +0000)]
Fix 100 LE device connection limitation
am: 013c32bf98

Change-Id: I64d57c1a19e41bcf35569eb707f58d31c9a54d63

7 years agoSupport TARGET_TRANSLATE_2ND_ARCH case
Victor Khimenko [Wed, 28 Sep 2016 22:40:03 +0000 (00:40 +0200)]
Support TARGET_TRANSLATE_2ND_ARCH case

Build-only change to support the multilib case where the second arch
is translated (and thus bluetooth library is needed).

"True" multilib case is explicitly not supported.

Test: Build system refactoring CL. Existing unit tests still pass.

BUG=31422117

Change-Id: I09f239d39f5dbe0848a89367327db1ea1074ca39

7 years agoSeparate the definition of BTM layer types from control blocks am: dc3c1f2afa am...
Jakub Pawlowski [Wed, 28 Sep 2016 21:32:12 +0000 (21:32 +0000)]
Separate the definition of BTM layer types from control blocks am: dc3c1f2afa am: f7af15140a am: b5a4a143de
am: 086cd130cb

Change-Id: Ibb6e851b7ec911ac5b19034de33e9d9fbbdc0098

7 years agoSeparate the definition of BTM layer types from control blocks am: dc3c1f2afa am...
Jakub Pawlowski [Wed, 28 Sep 2016 21:30:31 +0000 (21:30 +0000)]
Separate the definition of BTM layer types from control blocks am: dc3c1f2afa am: f7af15140a
am: b5a4a143de

Change-Id: Ifc520da330610371c16e2d1b5e418f1ecfff8b02

7 years agoSeparate the definition of BTM layer types from control blocks am: dc3c1f2afa
Jakub Pawlowski [Wed, 28 Sep 2016 21:27:02 +0000 (21:27 +0000)]
Separate the definition of BTM layer types from control blocks am: dc3c1f2afa
am: f7af15140a

Change-Id: I328bc6141dcc895530b93dca2981bd4bfeeb3da1

7 years agoSeparate the definition of BTM layer types from control blocks
Jakub Pawlowski [Wed, 28 Sep 2016 21:24:01 +0000 (21:24 +0000)]
Separate the definition of BTM layer types from control blocks
am: dc3c1f2afa

Change-Id: Iea26880f80f623744cd96b40c27188428b7d9860

7 years agoSeparate the definition of BTM layer types from control blocks
Jakub Pawlowski [Wed, 28 Sep 2016 16:02:39 +0000 (09:02 -0700)]
Separate the definition of BTM layer types from control blocks

Right now, data types, control blocks, and functions used in the BTM
layer are defined in the same header files. This means that if someone
wants to write a test that uses those data types, they must also define
all control blocks, or compile the whole module.

This patch separates the data types from other definitions. Thanks to
it, we will be able to write unit tests, once other dependencies get
separated.

Change-Id: Ibc089e273cc37642fbb8672964b266c20f8d825d

7 years agoFix 100 LE device connection limitation
Andre Eisenbach [Wed, 28 Sep 2016 01:07:58 +0000 (18:07 -0700)]
Fix 100 LE device connection limitation

Currently after 100 devices are added to the device security database,
any subsequent LE connection to a newly discovered LE device address
will fail as entries in the security record database are not reused.

This patch removes a device record if the device itself is removed and
also ensures that the oldest device security record is deleted if the
limit is reached to ensure a new record can be allocated.

Bug: 31625900
Change-Id: I22f6c82c64a9a9bfb2a16d79182903e5aa011355

7 years agoUse better callbacks in LE multi advertising am: 0a009c382f am: 2f7dd70c11 am: 1127103c3b
Jakub Pawlowski [Tue, 27 Sep 2016 18:50:32 +0000 (18:50 +0000)]
Use better callbacks in LE multi advertising am: 0a009c382f am: 2f7dd70c11 am: 1127103c3b
am: 68578304e8

Change-Id: I58e2dde869963a05d469e3ed5bdd02bc9d849847

7 years agoUse better callbacks in LE multi advertising am: 0a009c382f am: 2f7dd70c11
Jakub Pawlowski [Tue, 27 Sep 2016 18:48:00 +0000 (18:48 +0000)]
Use better callbacks in LE multi advertising am: 0a009c382f am: 2f7dd70c11
am: 1127103c3b

Change-Id: Ib24640b13cb8c2f4978b05ce68ebba106be89238

7 years agoUse better callbacks in LE multi advertising am: 0a009c382f
Jakub Pawlowski [Tue, 27 Sep 2016 18:45:37 +0000 (18:45 +0000)]
Use better callbacks in LE multi advertising am: 0a009c382f
am: 2f7dd70c11

Change-Id: Id0d07632d059a984dc350b69f8548aad88b61a3c

7 years agoUse better callbacks in LE multi advertising
Jakub Pawlowski [Tue, 27 Sep 2016 18:42:32 +0000 (18:42 +0000)]
Use better callbacks in LE multi advertising
am: 0a009c382f

Change-Id: Ia9e39fe19443641b6d17cc8e78e8156b5304619f

7 years agoUse better callbacks in LE multi advertising
Jakub Pawlowski [Tue, 6 Sep 2016 14:42:36 +0000 (07:42 -0700)]
Use better callbacks in LE multi advertising

Right now, LE multi advertising related code uses it's own
implementation of queue on top of static array. Use std::queue, and
base::Callback instead.

Changing function pointers to base::Callback instances is required for
further refactoring, which will turn this code into class.

Bug: 30622771
Test: sl4a BleAdvertiseApiTest ConcurrentBleAdvertisingTest
Change-Id: I839e036c6edb4e19a17def4d68d351296468f88c

7 years agoFix unnecessary error message during GATT discovery am: f2e3bea844 am: 7edffcd474...
Jakub Pawlowski [Tue, 27 Sep 2016 16:01:21 +0000 (16:01 +0000)]
Fix unnecessary error message during GATT discovery am: f2e3bea844 am: 7edffcd474  -s ours
am: 2bbf8adc4b

Change-Id: I3084f34938549c384552dc62b9453aa6b0e3dc12

7 years agoFix unnecessary error message during GATT discovery am: f2e3bea844
Jakub Pawlowski [Tue, 27 Sep 2016 15:58:05 +0000 (15:58 +0000)]
Fix unnecessary error message during GATT discovery am: f2e3bea844
am: 7edffcd474  -s ours

Change-Id: Ic99ab24d1000f5f9fbd75f937d9675d96bfac57e

7 years agoFix unnecessary error message during GATT discovery
Jakub Pawlowski [Tue, 27 Sep 2016 15:44:34 +0000 (15:44 +0000)]
Fix unnecessary error message during GATT discovery
am: f2e3bea844

Change-Id: Ied4363b52980f4a1e146c6186ffe920770f65866

7 years agoUpdate BUILD.gn files am: 29796eb6de am: d42287dd61 am: 59a4789cd8
Jakub Pawlowski [Tue, 27 Sep 2016 15:42:04 +0000 (15:42 +0000)]
Update BUILD.gn files am: 29796eb6de am: d42287dd61 am: 59a4789cd8
am: c62a60aa66

Change-Id: I2757988123d5c9488c7eeaa126a90ecb78111b17

7 years agoUpdate BUILD.gn files am: 29796eb6de am: d42287dd61
Jakub Pawlowski [Tue, 27 Sep 2016 15:39:34 +0000 (15:39 +0000)]
Update BUILD.gn files am: 29796eb6de am: d42287dd61
am: 59a4789cd8

Change-Id: I089264ea9600e498df77c2f01df9f851c70c3c79

7 years agoUpdate BUILD.gn files am: 29796eb6de
Jakub Pawlowski [Tue, 27 Sep 2016 15:36:04 +0000 (15:36 +0000)]
Update BUILD.gn files am: 29796eb6de
am: d42287dd61

Change-Id: Ic0c3dfae0e723d55ea53feb8c024579e66dbb443

7 years agoUpdate BUILD.gn files
Jakub Pawlowski [Tue, 27 Sep 2016 15:33:33 +0000 (15:33 +0000)]
Update BUILD.gn files
am: 29796eb6de

Change-Id: I41391c0764e9def86ff32e72e65222e0c3f6043f

7 years agoUpdate BUILD.gn files
Jakub Pawlowski [Tue, 27 Sep 2016 15:21:55 +0000 (08:21 -0700)]
Update BUILD.gn files

7 years agoFix unnecessary error message during GATT discovery
Jakub Pawlowski [Mon, 26 Sep 2016 21:05:18 +0000 (14:05 -0700)]
Fix unnecessary error message during GATT discovery

Bug: 31637098
Change-Id: Ib2545e7827bd338d2e22c88836818fce23e7a057

7 years agoBluetooth: Prevent gatt DB copy if server cache is absent am: c695f2578d am: 1b85fb00...
Nitin Arora [Sat, 24 Sep 2016 01:05:58 +0000 (01:05 +0000)]
Bluetooth: Prevent gatt DB copy if server cache is absent am: c695f2578d am: 1b85fb000a am: ec5ff3d956
am: 95e5e7155d

Change-Id: Ia3494b9a6b91ab11e6102caff4883dfdb97f6db5

7 years agoBluetooth: Prevent gatt DB copy if server cache is absent am: c695f2578d am: 1b85fb000a
Nitin Arora [Sat, 24 Sep 2016 00:34:44 +0000 (00:34 +0000)]
Bluetooth: Prevent gatt DB copy if server cache is absent am: c695f2578d am: 1b85fb000a
am: ec5ff3d956

Change-Id: I0c6e040a8b9e8256e55145a8b929fb99d77135c4

7 years agoBluetooth: Prevent gatt DB copy if server cache is absent am: c695f2578d
Nitin Arora [Sat, 24 Sep 2016 00:32:37 +0000 (00:32 +0000)]
Bluetooth: Prevent gatt DB copy if server cache is absent am: c695f2578d
am: 1b85fb000a

Change-Id: If0b5f4f2e397cf269ed25b684eacf5ea3fb65e51

7 years agoBluetooth: Prevent gatt DB copy if server cache is absent
Nitin Arora [Sat, 24 Sep 2016 00:31:06 +0000 (00:31 +0000)]
Bluetooth: Prevent gatt DB copy if server cache is absent
am: c695f2578d

Change-Id: Ic25dfb446c5133823523e3b707177739d1296a9a

7 years agoBluetooth: Prevent gatt DB copy if server cache is absent
Nitin Arora [Thu, 14 Jul 2016 01:02:03 +0000 (18:02 -0700)]
Bluetooth: Prevent gatt DB copy if server cache is absent

In case the server cache does not exist for a specific
connection, the API used to copy the server DB into the
DB structure needs to return immediately. This change
makes sure of that and prevents dereferencing of a null
block causing the runtime error.

Change-Id: Iec3040a1280ef9d80b1b9c76eca8071dff499411

7 years agoMerge "Convert BLE multi-advertising code to C++" am: 6cbb6f8c37 am: b2d733b15b am...
Jakub Pawlowski [Fri, 23 Sep 2016 21:21:03 +0000 (21:21 +0000)]
Merge "Convert BLE multi-advertising code to C++" am: 6cbb6f8c37 am: b2d733b15b am: 0f174ee3a8
am: f72876ab2f

Change-Id: I90246bcb8b01cd843923d0a7b2870f09f8a402d4

7 years agoMerge "Convert BLE multi-advertising code to C++" am: 6cbb6f8c37 am: b2d733b15b
Jakub Pawlowski [Fri, 23 Sep 2016 21:06:40 +0000 (21:06 +0000)]
Merge "Convert BLE multi-advertising code to C++" am: 6cbb6f8c37 am: b2d733b15b
am: 0f174ee3a8

Change-Id: I8198ec8bb793e675bc6d3673e4d58d784d7fd8dd

7 years agoMerge "Convert BLE multi-advertising code to C++" am: 6cbb6f8c37
Jakub Pawlowski [Fri, 23 Sep 2016 21:04:40 +0000 (21:04 +0000)]
Merge "Convert BLE multi-advertising code to C++" am: 6cbb6f8c37
am: b2d733b15b

Change-Id: I33565f33735b1143a8c6971aed4a25e2ce71a924

7 years agoMerge "Convert BLE multi-advertising code to C++"
Jakub Pawlowski [Fri, 23 Sep 2016 21:02:40 +0000 (21:02 +0000)]
Merge "Convert BLE multi-advertising code to C++"
am: 6cbb6f8c37

Change-Id: I917c9c38fafc5b8a4e537c89038e5bdd056e7c4c

7 years agoMerge "Convert BLE multi-advertising code to C++"
Jakub Pawlowski [Fri, 23 Sep 2016 20:53:24 +0000 (20:53 +0000)]
Merge "Convert BLE multi-advertising code to C++"

7 years agoFix the BLE connection failure with some mice am: 58c27b48aa am: 1b97714aa8
chaoyu.x.wu [Fri, 23 Sep 2016 20:15:50 +0000 (20:15 +0000)]
Fix the BLE connection failure with some mice am: 58c27b48aa am: 1b97714aa8
am: 8f76f23b55

Change-Id: Ie51d29af28577113f0c272cb40c4418cbf432e02

7 years agoFix the BLE connection failure with some mice am: 58c27b48aa
chaoyu.x.wu [Fri, 23 Sep 2016 20:00:06 +0000 (20:00 +0000)]
Fix the BLE connection failure with some mice am: 58c27b48aa
am: 1b97714aa8

Change-Id: I3cd24bae9b2015b7776d9b4aad96f643344cfcc4

7 years agoFix the BLE connection failure with some mice
chaoyu.x.wu [Fri, 23 Sep 2016 19:56:34 +0000 (19:56 +0000)]
Fix the BLE connection failure with some mice
am: 58c27b48aa

Change-Id: I45bdf4a316fca554c8c85cefdb87cff0cd2d21e6

7 years agoMerge "Move btsnoop_hci.log to /data/misc/bluetooth/logs" am: b64d604c0c am: 271a06c6...
Ajay Panicker [Fri, 23 Sep 2016 19:30:55 +0000 (19:30 +0000)]
Merge "Move btsnoop_hci.log to /data/misc/bluetooth/logs" am: b64d604c0c am: 271a06c67d am: f5c6c7b801
am: 9074ae1a44

Change-Id: I8cbc50eecf506d96be9780e8a520560c76b6b794

7 years agoMerge "Move btsnoop_hci.log to /data/misc/bluetooth/logs" am: b64d604c0c am: 271a06c67d
Ajay Panicker [Fri, 23 Sep 2016 19:17:32 +0000 (19:17 +0000)]
Merge "Move btsnoop_hci.log to /data/misc/bluetooth/logs" am: b64d604c0c am: 271a06c67d
am: f5c6c7b801

Change-Id: I66fe55ba8ba938e097a321921a29abc4f40cf791

7 years agoMerge "Move btsnoop_hci.log to /data/misc/bluetooth/logs" am: b64d604c0c
Ajay Panicker [Fri, 23 Sep 2016 19:15:32 +0000 (19:15 +0000)]
Merge "Move btsnoop_hci.log to /data/misc/bluetooth/logs" am: b64d604c0c
am: 271a06c67d

Change-Id: I7f27d2f0bd6b0bf303e570cc376d90397a36d390

7 years agoMerge "Move btsnoop_hci.log to /data/misc/bluetooth/logs"
Ajay Panicker [Fri, 23 Sep 2016 19:13:32 +0000 (19:13 +0000)]
Merge "Move btsnoop_hci.log to /data/misc/bluetooth/logs"
am: b64d604c0c

Change-Id: I87d5ef9224da76d569c2e4b32782f839686590df

7 years agoMerge "Move btsnoop_hci.log to /data/misc/bluetooth/logs"
Ajay Panicker [Fri, 23 Sep 2016 19:00:17 +0000 (19:00 +0000)]
Merge "Move btsnoop_hci.log to /data/misc/bluetooth/logs"

7 years agoConvert BLE multi-advertising code to C++
Jakub Pawlowski [Mon, 5 Sep 2016 11:31:34 +0000 (04:31 -0700)]
Convert BLE multi-advertising code to C++

This patch converts btm_ble_multi_adv.c file to .cc. It also separate
header definitions from rest of BTM layer. It is another step towards
making BLE advertising-related code testable.

Bug: 30622771
Change-Id: I89965e10fbf773e48176ee19ef613dd0df2fb951