OSDN Git Service

android-x86/system-bt.git
6 years agoMerge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into nyc-dev...
Hansong Zhang [Fri, 12 Jan 2018 19:26:52 +0000 (19:26 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into nyc-dev am: 6e677aab4a am: bd83a19885 am: 956bb8e1fb am: 552786c50f
am: 4b94d30c60  -s ours

Change-Id: I3ed1c07f9ee15d3ae9127c9463fd587ee33d99ec

6 years agoMerge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev am: 5755f66220 am...
Hansong Zhang [Fri, 12 Jan 2018 19:26:39 +0000 (19:26 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev am: 5755f66220 am: 88312931fd am: 0c8337c1e7 am: 0ebb1d7ac5
am: f89d1d78f9  -s ours

Change-Id: I67a120b806fd7a4951a451248f279fd917dfc6cf

6 years agoMerge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into nyc-dev...
Hansong Zhang [Fri, 12 Jan 2018 19:22:09 +0000 (19:22 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into nyc-dev am: 6e677aab4a am: bd83a19885 am: 956bb8e1fb
am: 552786c50f

Change-Id: I8741e34d6670e4ee4dcf8d6684a1ff11286d4c09

6 years agoMerge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev am: 5755f66220 am...
Hansong Zhang [Fri, 12 Jan 2018 19:21:52 +0000 (19:21 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev am: 5755f66220 am: 88312931fd am: 0c8337c1e7
am: 0ebb1d7ac5

Change-Id: I44c647076510e6396e6141b5b5d94a3f1283fd0d

6 years agoMerge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into nyc-dev...
Hansong Zhang [Fri, 12 Jan 2018 19:17:30 +0000 (19:17 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into nyc-dev am: 6e677aab4a am: bd83a19885
am: 956bb8e1fb

Change-Id: Iaa957284a29d1e101a7347e5e3c5fded62037e90

6 years agoMerge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev am: 5755f66220 am...
Hansong Zhang [Fri, 12 Jan 2018 19:17:14 +0000 (19:17 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev am: 5755f66220 am: 88312931fd
am: 0c8337c1e7

Change-Id: Ied3f18ad9151277c0929c291f34d7c192240f265

6 years agoMerge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into nyc-dev...
Hansong Zhang [Fri, 12 Jan 2018 19:11:54 +0000 (19:11 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into nyc-dev am: 6e677aab4a
am: bd83a19885

Change-Id: Ie010a0be70337bca536e0f34075a4ff571c4f4ad

6 years agoMerge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev am: 5755f66220
Hansong Zhang [Fri, 12 Jan 2018 19:11:40 +0000 (19:11 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev am: 5755f66220
am: 88312931fd

Change-Id: Ie2eaf68551b3d36eefeb0c802317da5ecf430df5

6 years agoMerge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into nyc-dev
Hansong Zhang [Fri, 12 Jan 2018 19:05:30 +0000 (19:05 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into nyc-dev
am: 6e677aab4a

Change-Id: I572e0effe9b6a1952378d320b403756486102897

6 years agoMerge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev
Hansong Zhang [Fri, 12 Jan 2018 19:05:11 +0000 (19:05 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev
am: 5755f66220

Change-Id: I509364deeeb49d1c0e78bd5146edc04348cbc4fc

6 years agoMerge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into nyc-dev
Hansong Zhang [Fri, 12 Jan 2018 18:59:31 +0000 (18:59 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into nyc-dev

6 years agoMerge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev
Hansong Zhang [Fri, 12 Jan 2018 18:59:27 +0000 (18:59 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev

6 years agoMerge "Fix unexpected behavior in SDP" into oc-dev
Hansong Zhang [Fri, 12 Jan 2018 18:59:26 +0000 (18:59 +0000)]
Merge "Fix unexpected behavior in SDP" into oc-dev

6 years agoAllocate/free the SDP connection timers only during stack startup/shutdown
Pavlin Radoslavov [Fri, 12 Jan 2018 01:28:16 +0000 (17:28 -0800)]
Allocate/free the SDP connection timers only during stack startup/shutdown

This avoids freeing the sdp_conn_timer within the alarm callback itself.

Bug: 67110137
Test: Manual
Change-Id: I775b4b532cd42cf207258c53c6052a167a124627
Merged-In: I775b4b532cd42cf207258c53c6052a167a124627
(cherry picked from commit ef6a4a0c9d9220a7d909863349d7a0c0b967d54c)

6 years agoDO NOT MERGE Fix unexpected behavior in reading BNEP packets
Hansong Zhang [Thu, 11 Jan 2018 00:59:48 +0000 (16:59 -0800)]
DO NOT MERGE Fix unexpected behavior in reading BNEP packets

Bug: 67863755
Bug: 69177251
Bug: 69177292
Bug: 69271284
Test: BNEP still works
Change-Id: I41b8bfe5e123a56b8812124178663735f2bf3372

6 years agoMerge "SDP: Pass the bounds to process_service_*_rsp" into oc-dev
TreeHugger Robot [Thu, 11 Jan 2018 18:23:24 +0000 (18:23 +0000)]
Merge "SDP: Pass the bounds to process_service_*_rsp" into oc-dev

6 years agoRemoved alarm callback execution statistics am: b9ebb4ab26 am: 944a096f7c am: 484a8ff...
Pavlin Radoslavov [Thu, 11 Jan 2018 01:26:46 +0000 (01:26 +0000)]
Removed alarm callback execution statistics am: b9ebb4ab26 am: 944a096f7c am: 484a8ff430 am: dfe7791399
am: bbe82d4017  -s ours

Change-Id: Ice40110fbd607769f53dceaa111b61524c4820b7

6 years agoRemoved alarm callback execution statistics am: b9ebb4ab26 am: 944a096f7c am: 484a8ff430
Pavlin Radoslavov [Thu, 11 Jan 2018 01:23:09 +0000 (01:23 +0000)]
Removed alarm callback execution statistics am: b9ebb4ab26 am: 944a096f7c am: 484a8ff430
am: dfe7791399

Change-Id: I3f8f645bfdbb7c27d44dba115dc321a6ab51fc7a

6 years agoRemoved alarm callback execution statistics am: b9ebb4ab26 am: 944a096f7c
Pavlin Radoslavov [Thu, 11 Jan 2018 01:21:14 +0000 (01:21 +0000)]
Removed alarm callback execution statistics am: b9ebb4ab26 am: 944a096f7c
am: 484a8ff430

Change-Id: I7a2e3f2fd89c4c7df94f3650768c221f986b2c18

6 years agoRemoved alarm callback execution statistics am: b9ebb4ab26
Pavlin Radoslavov [Thu, 11 Jan 2018 01:18:37 +0000 (01:18 +0000)]
Removed alarm callback execution statistics am: b9ebb4ab26
am: 944a096f7c

Change-Id: I69a82dfa9cc6e3201ffed6cf6761a3a6c1f4ff70

6 years agoRemoved alarm callback execution statistics
Pavlin Radoslavov [Thu, 11 Jan 2018 01:16:06 +0000 (01:16 +0000)]
Removed alarm callback execution statistics
am: b9ebb4ab26

Change-Id: I21f70a4a332f9335e609b763f26571c3f74991dd

6 years agoSDP: Pass the bounds to process_service_*_rsp
Myles Watson [Wed, 10 Jan 2018 22:16:15 +0000 (14:16 -0800)]
SDP: Pass the bounds to process_service_*_rsp

Test: build
Bug: 68161546
Change-Id: Icf53d4d05f99b5e0a2b3f4d3735b6fbfd62adaa3

6 years agoFix unexpected behavior in SDP
Hansong Zhang [Wed, 10 Jan 2018 01:16:35 +0000 (17:16 -0800)]
Fix unexpected behavior in SDP

Bug: 68776054
Bug: 68817966
Test: Bluetooth SDP still works
Change-Id: I4eef22679a313b88d7e8ec463b29dbb592c6b5b9

6 years agoDO NOT MERGE Fix unexpected behavior in SDP
Hansong Zhang [Wed, 10 Jan 2018 03:43:20 +0000 (19:43 -0800)]
DO NOT MERGE Fix unexpected behavior in SDP

Bug: 68776054
Bug: 68817966
Test: Bluetooth SDP still works
Change-Id: I4eef22679a313b88d7e8ec463b29dbb592c6b5b9
Merged-In: I4eef22679a313b88d7e8ec463b29dbb592c6b5b9

6 years agoRemoved alarm callback execution statistics
Pavlin Radoslavov [Mon, 8 Jan 2018 19:37:05 +0000 (11:37 -0800)]
Removed alarm callback execution statistics

Updating the alarm state after the callback returns can be problematic
in case the callback itself deleted the alarm.

Bug: 67110137
Test: Manual
Change-Id: Id4de06eebedb792cadd63d09efb68672e9bddc69
Merged-In: Id4de06eebedb792cadd63d09efb68672e9bddc69
(cherry picked from commit 04574e1cde3b0d46b59b4b6ebab935ac60af9f97)

6 years agoRemoved alarm callback execution statistics
Pavlin Radoslavov [Mon, 8 Jan 2018 19:37:05 +0000 (11:37 -0800)]
Removed alarm callback execution statistics

Updating the alarm state after the callback returns can be problematic
in case the callback itself deleted the alarm.

Bug: 67110137
Test: Manual
Change-Id: Id4de06eebedb792cadd63d09efb68672e9bddc69
Merged-In: Id4de06eebedb792cadd63d09efb68672e9bddc69
(cherry picked from commit 04574e1cde3b0d46b59b4b6ebab935ac60af9f97)

6 years agoDO NOT MERGE ANYWHERE: Disable the use of GATT cache by default. am: b050cd5d9a ...
Jacky Cheung [Fri, 1 Dec 2017 22:51:36 +0000 (22:51 +0000)]
DO NOT MERGE ANYWHERE: Disable the use of GATT cache by default. am: b050cd5d9a  -s ours
am: 148f6d31a0  -s ours

Change-Id: I9393ade6467b657ac813666d9f0e1a1937575024

6 years agoDO NOT MERGE ANYWHERE: Disable the use of GATT cache by default.
Jacky Cheung [Fri, 1 Dec 2017 22:49:36 +0000 (22:49 +0000)]
DO NOT MERGE ANYWHERE: Disable the use of GATT cache by default.
am: b050cd5d9a  -s ours

Change-Id: Iaf10a993829cebefecbf49290dd0db345cd71dde

6 years agoDO NOT MERGE ANYWHERE: Disable the use of GATT cache by default.
Jacky Cheung [Tue, 7 Nov 2017 19:17:38 +0000 (11:17 -0800)]
DO NOT MERGE ANYWHERE: Disable the use of GATT cache by default.

When a set of GATT services of a bonded device is cached locally,
an application needs to call BluetoothGatt.refresh() to clear it out
and to trigger a new service discovery.  By disabling local caching,
a service discovery is performed on every connection and that prevents
an application from getting staled GATT services.

bug: 68954828
Change-Id: I2c07404c3d56a5c8a0ffc86bc65d36480f3c46f2

6 years agoRead the correct amount of attributes am: 4d1470eb54 am: 48e5396b99 am: 57f958e7e3...
Scott Bauer [Thu, 12 Oct 2017 00:20:01 +0000 (00:20 +0000)]
Read the correct amount of attributes am: 4d1470eb54 am: 48e5396b99 am: 57f958e7e3 am: e69e6e0fab
am: 1e67cf4b2e

Change-Id: Ic0858b82dd5c15b824a74e53817e42e1945d1a7d

6 years agoRead the correct amount of attributes am: 636b754cfa am: 5ec93991d7
Scott Bauer [Thu, 12 Oct 2017 00:19:36 +0000 (00:19 +0000)]
Read the correct amount of attributes am: 636b754cfa am: 5ec93991d7
am: 6e7c360c85

Change-Id: Icb1240a22b2cfc7fa32b3ab23652fa1510b3c590

6 years agoRead the correct amount of attributes
Scott Bauer [Thu, 12 Oct 2017 00:18:39 +0000 (00:18 +0000)]
Read the correct amount of attributes
am: 8eb6493ad5  -s ours

Change-Id: I73a8ff63af23863be10d8cdd4da73234fcd25e3d

6 years agoMerge "Read the correct amount of attributes" into oc-dev
TreeHugger Robot [Wed, 11 Oct 2017 23:11:13 +0000 (23:11 +0000)]
Merge "Read the correct amount of attributes" into oc-dev

6 years agoRead the correct amount of attributes am: 4d1470eb54 am: 48e5396b99 am: 57f958e7e3
Scott Bauer [Wed, 11 Oct 2017 22:38:19 +0000 (22:38 +0000)]
Read the correct amount of attributes am: 4d1470eb54 am: 48e5396b99 am: 57f958e7e3
am: e69e6e0fab

Change-Id: I4a4802e3bf181f09d8de652d991cc26686e467e4

6 years agoRead the correct amount of attributes am: 636b754cfa
Scott Bauer [Wed, 11 Oct 2017 22:37:12 +0000 (22:37 +0000)]
Read the correct amount of attributes am: 636b754cfa
am: 5ec93991d7

Change-Id: I69bd3d4e294765feade3840d9f1710cfa1cdc69b

6 years agoRead the correct amount of attributes am: 4d1470eb54 am: 48e5396b99
Scott Bauer [Wed, 11 Oct 2017 22:34:23 +0000 (22:34 +0000)]
Read the correct amount of attributes am: 4d1470eb54 am: 48e5396b99
am: 57f958e7e3

Change-Id: I3a664ecfa9eebde0459f299fa3a26c70c528e3b8

6 years agoRead the correct amount of attributes
Scott Bauer [Wed, 11 Oct 2017 22:33:55 +0000 (22:33 +0000)]
Read the correct amount of attributes
am: 636b754cfa

Change-Id: I43948bbb53b3075e7e7b016b9127f38245a8f9da

6 years agoRead the correct amount of attributes am: 4d1470eb54
Scott Bauer [Wed, 11 Oct 2017 22:28:54 +0000 (22:28 +0000)]
Read the correct amount of attributes am: 4d1470eb54
am: 48e5396b99

Change-Id: I93404b4895d4609e9f0afbc9d020cfae20f4f820

6 years agoRead the correct amount of attributes
Scott Bauer [Wed, 11 Oct 2017 22:26:14 +0000 (22:26 +0000)]
Read the correct amount of attributes
am: 4d1470eb54

Change-Id: I153a91a1aba1a78837c397d4ee01bea2d1696e4e

6 years agoFixed the implementation of std::equal_to<bt_bdaddr_t>
Pavlin Radoslavov [Wed, 30 Aug 2017 00:03:21 +0000 (17:03 -0700)]
Fixed the implementation of std::equal_to<bt_bdaddr_t>

Now we correctly suppress the processing of repetitive
BLE scan results.

Test: Manual with extra log messages
Bug: 65174158
Bug: 64975965
Change-Id: Ic4386c5e2fbabdc218f6ec675c5b298a7af41e5a
Merged-In: Ie0694843ad5fbd2a80b310c5f532e5e5a9548043

6 years agoRead the correct amount of attributes
Scott Bauer [Fri, 7 Apr 2017 00:35:40 +0000 (18:35 -0600)]
Read the correct amount of attributes

bta_gattc_cache_load currently attempts to read 0xFF attributes into an
allocation sized to num_attr attributes, which can be smaller than 0xFF.

There aren't more than num_attr bytes in correct data, but this breaks
with dynamic buffer overflow checking in CopperheadOS for the read
system call since fread ends up calling read, which obtains the size of
the allocation from the malloc implementation and then aborts due to the
(potential) overflow.

This would also fail with the default enabled _FORTIFY_SOURCE=2 feature
in the Android Open Source Project if osi_malloc was marked with the
alloc_size attribute. The way it wraps malloc loses that information so
fortify checks aren't done for calls like this.

Bug: 37160362
Change-Id: I68bd170d5378c9d9d21cbda376083bc0b857e15c
Signed-off-by: Scott Bauer <sbauer@plzdonthack.me>
[migrated to C++ file, added 0xFFFF limit and wrote commit message]
Signed-off-by: Daniel Micay <danielmicay@gmail.com>
6 years agoRead the correct amount of attributes
Scott Bauer [Fri, 7 Apr 2017 00:35:40 +0000 (18:35 -0600)]
Read the correct amount of attributes

bta_gattc_cache_load currently attempts to read 0xFF attributes into an
allocation sized to num_attr attributes, which can be smaller than 0xFF.

There aren't more than num_attr bytes in correct data, but this breaks
with dynamic buffer overflow checking in CopperheadOS for the read
system call since fread ends up calling read, which obtains the size of
the allocation from the malloc implementation and then aborts due to the
(potential) overflow.

This would also fail with the default enabled _FORTIFY_SOURCE=2 feature
in the Android Open Source Project if osi_malloc was marked with the
alloc_size attribute. The way it wraps malloc loses that information so
fortify checks aren't done for calls like this.

Bug: 37160362
Change-Id: I68bd170d5378c9d9d21cbda376083bc0b857e15c
Signed-off-by: Scott Bauer <sbauer@plzdonthack.me>
[migrated to C++ file, added 0xFFFF limit and wrote commit message]
Signed-off-by: Daniel Micay <danielmicay@gmail.com>
6 years agoRead the correct amount of attributes
Scott Bauer [Fri, 7 Apr 2017 00:35:40 +0000 (18:35 -0600)]
Read the correct amount of attributes

bta_gattc_cache_load currently attempts to read 0xFF attributes into an
allocation sized to num_attr attributes, which can be smaller than 0xFF.

There aren't more than num_attr bytes in correct data, but this breaks
with dynamic buffer overflow checking in CopperheadOS for the read
system call since fread ends up calling read, which obtains the size of
the allocation from the malloc implementation and then aborts due to the
(potential) overflow.

This would also fail with the default enabled _FORTIFY_SOURCE=2 feature
in the Android Open Source Project if osi_malloc was marked with the
alloc_size attribute. The way it wraps malloc loses that information so
fortify checks aren't done for calls like this.

Bug: 37160362
Change-Id: I68bd170d5378c9d9d21cbda376083bc0b857e15c
Signed-off-by: Scott Bauer <sbauer@plzdonthack.me>
[migrated to C++ file, added 0xFFFF limit and wrote commit message]
Signed-off-by: Daniel Micay <danielmicay@gmail.com>
6 years agoRead the correct amount of attributes
Scott Bauer [Fri, 7 Apr 2017 00:35:40 +0000 (18:35 -0600)]
Read the correct amount of attributes

bta_gattc_cache_load currently attempts to read 0xFF attributes into an
allocation sized to num_attr attributes, which can be smaller than 0xFF.

There aren't more than num_attr bytes in correct data, but this breaks
with dynamic buffer overflow checking in CopperheadOS for the read
system call since fread ends up calling read, which obtains the size of
the allocation from the malloc implementation and then aborts due to the
(potential) overflow.

This would also fail with the default enabled _FORTIFY_SOURCE=2 feature
in the Android Open Source Project if osi_malloc was marked with the
alloc_size attribute. The way it wraps malloc loses that information so
fortify checks aren't done for calls like this.

Bug: 37160362
Change-Id: I68bd170d5378c9d9d21cbda376083bc0b857e15c
Signed-off-by: Scott Bauer <sbauer@plzdonthack.me>
[migrated to C++ file, added 0xFFFF limit and wrote commit message]
Signed-off-by: Daniel Micay <danielmicay@gmail.com>
6 years agoFix build error for AVRCP13 compat fix
Andre Eisenbach [Sat, 16 Sep 2017 07:22:10 +0000 (00:22 -0700)]
Fix build error for AVRCP13 compat fix

Bug: 37943083
Test: manual
Change-Id: I3974192dd007804f90f35a724a39824ed093a633
Merged-In: I6d041590dc51d7e8711b17fb1cb9c880b640052a

6 years agoChange our AVRCP capabilities if the remote device only supports 1.3
Ajay Panicker [Wed, 6 Sep 2017 16:59:51 +0000 (09:59 -0700)]
Change our AVRCP capabilities if the remote device only supports 1.3

This prevents issues with devices that only support 1.3 but can not
handle forward compatability like some Alpine Carkits.

Bug: 37943083
Test: Connect to Alpine carkit that only supports 1.3 and see new features
      are used.

Change-Id: I6d041590dc51d7e8711b17fb1cb9c880b640052a
Merged-In: I6d041590dc51d7e8711b17fb1cb9c880b640052a
(cherry picked from commit f9f1c8b449efb9cb7894a64fe2977f875679ba52)
(cherry picked from commit ff2d86ed3af91099597d033a76a143437543d6fd)

6 years agoGAP: Set service_id before calling gap_release_ccb
Myles Watson [Thu, 14 Sep 2017 21:13:44 +0000 (14:13 -0700)]
GAP: Set service_id before calling gap_release_ccb

Calling gap_release_ccb with a service_id == 0, which in turn
calls BTM_SecClrService with an ID of 0.

From the documentation for BTM_SecClrService:

  Service ID - Id of the service to remove. '0' removes all
               service records (except SDP).

Bug: 6569576965223508
Test: BLE connection and characteristic read
Change-Id: Icf309807f02e1faa273cf9bad9c09d9221a8bbfd
(cherry picked from commit 5c5c10683e2a11162838297fc8054b15837c4f32)
(cherry picked from commit 4023c6731d5e991c6202d4e499b9dd43d642fb3c)

6 years agoEnsure that services are cleaned from the GattServer HandleMap.
Jeremy Klein [Fri, 8 Sep 2017 21:04:39 +0000 (14:04 -0700)]
Ensure that services are cleaned from the GattServer HandleMap.

The incorrect service handle was being plumbed up to onServiceDeleted.
This was causing stale entries to stick around forever in the HandleMap,
which could later cause failures to find callback references in
ContextMap if the connection ID changed for a given device.

Bug: 65463237
Test: unit tests modified and run
Change-Id: I2e22858b447f4e6b5a4fbceee4c406191c84a67d
(cherry picked from commit e631789075f5625fd79c774678f4af0bf102c7d1)

7 years agoSDP: Bounds check 'id' parameter for free_sdp_slot() am: 294cc61f4f am: 5dc24c7b41...
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

7 years agoSDP: Bounds check 'id' parameter for free_sdp_slot() am: 294cc61f4f am: 5dc24c7b41...
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

7 years agoSDP: Bounds check 'id' parameter for free_sdp_slot() am: 294cc61f4f am: 5dc24c7b41...
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

7 years agoSDP: Bounds check 'id' parameter for free_sdp_slot() am: 294cc61f4f am: 5dc24c7b41...
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

7 years agoSDP: Bounds check 'id' parameter for free_sdp_slot() am: 294cc61f4f am: 5dc24c7b41...
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

7 years agoSDP: Bounds check 'id' parameter for free_sdp_slot() am: 294cc61f4f am: 5dc24c7b41...
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

7 years agoSDP: Bounds check 'id' parameter for free_sdp_slot() am: 294cc61f4f am: 5dc24c7b41
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

7 years agoSDP: Bounds check 'id' parameter for free_sdp_slot() am: 294cc61f4f
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

7 years agoSDP: Bounds check 'id' parameter for free_sdp_slot()
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

7 years agoSDP: Bounds check 'id' parameter for free_sdp_slot() am: 82e4754aaa am: 3b90fd7b0c...
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

7 years agoSDP: Bounds check 'id' parameter for free_sdp_slot() am: 82e4754aaa am: 3b90fd7b0c...
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

7 years agoSDP: Bounds check 'id' parameter for free_sdp_slot() am: 82e4754aaa am: 3b90fd7b0c
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

7 years agoSDP: Bounds check 'id' parameter for free_sdp_slot() am: 82e4754aaa
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

7 years agoSDP: Bounds check 'id' parameter for free_sdp_slot()
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

7 years agoSDP: Bounds check 'id' parameter for free_sdp_slot()
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)

7 years agoSDP: Bounds check 'id' parameter for free_sdp_slot()
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)

7 years agoSDP: Bounds check 'id' parameter for free_sdp_slot()
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

7 years agoDO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously...
Tyler Freeman [Tue, 1 Aug 2017 01:33:50 +0000 (01:33 +0000)]
DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (3/3) am: fead72d124  -s ours
am: 672ca0faf5  -s ours

Change-Id: Icf9b2a90b0adb3d9645bd6839ed9c244ba8c8c26

7 years agoDO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously...
Tyler Freeman [Tue, 1 Aug 2017 01:24:13 +0000 (01:24 +0000)]
DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (3/3)
am: fead72d124  -s ours

Change-Id: I96daa5c94b8ac75e2e7faf00911274ba72dff51b

7 years agoDO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously...
Tyler Freeman [Fri, 28 Jul 2017 01:21:18 +0000 (18:21 -0700)]
DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (3/3)

There are intermittent issues where either the returned Bluetooth
MAC address to Java framework is uninitialized or this address update
arrives too late. This fix will do 2 things:
(1) Returns error when MAC address is unavailable in the native code.
(2) Updates the MAC address later by adding a new broadcast event.

Test: Check address for these cases: factory reset, system reboot, and
Bluetooth re-enable.
Bug: 36709382

(cherry picked from commit 7dc0525365025e17e289869288b1b7d5146306cc)
Merged-In: I7b1c526ee227897c003ac921078f317f96b92604

Change-Id: I9810484a136c69d487a4b415c9265913db6c5cce

7 years agoMerge "Add missing extension length check while parsing BNEP control packets" into...
Pavlin Radoslavov [Tue, 18 Jul 2017 19:29:14 +0000 (19:29 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am: fdcad53f8e am: fd94c15a5a am: 0cea290eee am: 97922c7401 am: c0008b6c2f am: 42b29f1ce6 am: 5328c7a32d am: 33f4a8065e
am: 471e964d69

Change-Id: I2285382ec2b4f7629fca84740933bb85b22fbfab

7 years agoFree p_pending_data from tBNEP_CONN to avoid potential memory leaks am: 8f18afd26c...
Pavlin Radoslavov [Tue, 18 Jul 2017 19:28:48 +0000 (19:28 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am: 8f18afd26c am: ffa87779a1 am: 7eda996189 am: ba12732aad  -s ours am: 107bb0f68d  -s ours am: 73df1dfa11  -s ours am: 3fe34fe3fb  -s ours am: 6d3312cdf0  -s ours
am: 515c909b33  -s ours

Change-Id: Ifffcbca70228a8bdac4bb00991742ced3a0c8e35

7 years agoMerge "Add missing extension length check while parsing BNEP control packets" into...
Pavlin Radoslavov [Tue, 18 Jul 2017 19:26:05 +0000 (19:26 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am: fdcad53f8e am: fd94c15a5a am: 0cea290eee am: 97922c7401 am: c0008b6c2f am: 42b29f1ce6 am: 5328c7a32d
am: 33f4a8065e

Change-Id: I460a7805ba5d6ce28751bfba59245026ab09d49b

7 years agoFree p_pending_data from tBNEP_CONN to avoid potential memory leaks am: 8f18afd26c...
Pavlin Radoslavov [Tue, 18 Jul 2017 19:25:48 +0000 (19:25 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am: 8f18afd26c am: ffa87779a1 am: 7eda996189 am: ba12732aad  -s ours am: 107bb0f68d  -s ours am: 73df1dfa11  -s ours am: 3fe34fe3fb  -s ours
am: 6d3312cdf0  -s ours

Change-Id: Idb3ed55f34818ce3af08e56787ac51dff49d6d92

7 years agoMerge "Add missing extension length check while parsing BNEP control packets" into...
Pavlin Radoslavov [Tue, 18 Jul 2017 19:25:45 +0000 (19:25 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into nyc-dev am: c3619e1436 am: d647097c74 am: 0a9673bceb am: 88f2ae07f4
am: 384e1dff72  -s ours

Change-Id: I041e907145d3f299b59c3fcbd8ae25c86176622d

7 years agoMerge "Add missing extension length check while parsing BNEP control packets" into...
Pavlin Radoslavov [Tue, 18 Jul 2017 19:23:04 +0000 (19:23 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am: fdcad53f8e am: fd94c15a5a am: 0cea290eee am: 97922c7401 am: c0008b6c2f am: 42b29f1ce6
am: 5328c7a32d

Change-Id: I825dc2f50a83d94b54baf1f430e71c63f6bfcb3e

7 years agoFree p_pending_data from tBNEP_CONN to avoid potential memory leaks am: 8f18afd26c...
Pavlin Radoslavov [Tue, 18 Jul 2017 19:22:48 +0000 (19:22 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am: 8f18afd26c am: ffa87779a1 am: 7eda996189 am: ba12732aad  -s ours am: 107bb0f68d  -s ours am: 73df1dfa11  -s ours
am: 3fe34fe3fb  -s ours

Change-Id: Id43622ce2ff6520e12bc80d4d034c59d3ab909ca

7 years agoMerge "Add missing extension length check while parsing BNEP control packets" into...
Pavlin Radoslavov [Tue, 18 Jul 2017 19:20:44 +0000 (19:20 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am: fdcad53f8e am: fd94c15a5a am: 0cea290eee am: 97922c7401 am: c0008b6c2f
am: 42b29f1ce6

Change-Id: Idea1e755dd079731745a899aa7668a0f7179cb9e

7 years agoFree p_pending_data from tBNEP_CONN to avoid potential memory leaks am: 8f18afd26c...
Pavlin Radoslavov [Tue, 18 Jul 2017 19:20:17 +0000 (19:20 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am: 8f18afd26c am: ffa87779a1 am: 7eda996189 am: ba12732aad  -s ours am: 107bb0f68d  -s ours
am: 73df1dfa11  -s ours

Change-Id: If35fa07c33914a1df863f0c72b0d3061ae463678

7 years agoMerge "Add missing extension length check while parsing BNEP control packets" into...
Pavlin Radoslavov [Tue, 18 Jul 2017 19:12:54 +0000 (19:12 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am: fdcad53f8e am: fd94c15a5a am: 0cea290eee am: 97922c7401
am: c0008b6c2f

Change-Id: Id14d11e553b6ba2f3fa688302415c79a537940a2

7 years agoFree p_pending_data from tBNEP_CONN to avoid potential memory leaks am: f8fc7f7d11...
Pavlin Radoslavov [Tue, 18 Jul 2017 19:12:36 +0000 (19:12 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am: f8fc7f7d11 am: 2b53cd05f2 am: 28d58cb2c8 am: 9fa3d4f2c7
am: 92744bc2ce  -s ours

Change-Id: I2e18a2b625023a318da67b7a5140fac5fb9ee590

7 years agoFree p_pending_data from tBNEP_CONN to avoid potential memory leaks am: 8f18afd26c...
Pavlin Radoslavov [Tue, 18 Jul 2017 19:12:36 +0000 (19:12 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am: 8f18afd26c am: ffa87779a1 am: 7eda996189 am: ba12732aad  -s ours
am: 107bb0f68d  -s ours

Change-Id: Ib74d462308ed0e99f75aaca7e9344de3b07ba5a8

7 years agoMerge "Add missing extension length check while parsing BNEP control packets" into...
Pavlin Radoslavov [Tue, 18 Jul 2017 19:05:52 +0000 (19:05 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into nyc-dev am: c3619e1436 am: d647097c74 am: 0a9673bceb
am: 88f2ae07f4

Change-Id: I05f7864e4eb435e5d0cc7f5275fd4f34deb724b8

7 years agoMerge "Add missing extension length check while parsing BNEP control packets" into...
Pavlin Radoslavov [Tue, 18 Jul 2017 19:05:51 +0000 (19:05 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am: fdcad53f8e am: fd94c15a5a am: 0cea290eee
am: 97922c7401

Change-Id: Id1569df9156b8de893dcb5c28997ec4a924eb82e

7 years agoFree p_pending_data from tBNEP_CONN to avoid potential memory leaks am: 8f18afd26c...
Pavlin Radoslavov [Tue, 18 Jul 2017 19:05:38 +0000 (19:05 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am: 8f18afd26c am: ffa87779a1 am: 7eda996189
am: ba12732aad  -s ours

Change-Id: Id1a43cefdc006f9f6d24b35b21502c8453bdd673

7 years agoFree p_pending_data from tBNEP_CONN to avoid potential memory leaks am: f8fc7f7d11...
Pavlin Radoslavov [Tue, 18 Jul 2017 19:05:37 +0000 (19:05 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am: f8fc7f7d11 am: 2b53cd05f2 am: 28d58cb2c8
am: 9fa3d4f2c7

Change-Id: Ia4b3bc004eb035bc219c168588fd548f57d09ae1

7 years agoMerge "Add missing extension length check while parsing BNEP control packets" into...
Pavlin Radoslavov [Tue, 18 Jul 2017 19:01:20 +0000 (19:01 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into nyc-dev am: c3619e1436 am: d647097c74
am: 0a9673bceb

Change-Id: Ie95b83df4e6207985196ab5fb9b27bb8c90c06ac

7 years agoMerge "Add missing extension length check while parsing BNEP control packets" into...
Pavlin Radoslavov [Tue, 18 Jul 2017 19:01:19 +0000 (19:01 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am: fdcad53f8e am: fd94c15a5a
am: 0cea290eee

Change-Id: I24ad37b139ec7af93fde160b16da095d77bd4729

7 years agoFree p_pending_data from tBNEP_CONN to avoid potential memory leaks am: 8f18afd26c...
Pavlin Radoslavov [Tue, 18 Jul 2017 19:01:05 +0000 (19:01 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am: 8f18afd26c am: ffa87779a1
am: 7eda996189

Change-Id: I3587c48c072b808e8a84a63d1e6f63ea39f158b5

7 years agoFree p_pending_data from tBNEP_CONN to avoid potential memory leaks am: f8fc7f7d11...
Pavlin Radoslavov [Tue, 18 Jul 2017 19:01:05 +0000 (19:01 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am: f8fc7f7d11 am: 2b53cd05f2
am: 28d58cb2c8

Change-Id: I4bcb033225cf04a45b8338d2298e761d58e2cbb2

7 years agoMerge "Add missing extension length check while parsing BNEP control packets" into...
Pavlin Radoslavov [Tue, 18 Jul 2017 18:55:47 +0000 (18:55 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into nyc-dev am: c3619e1436
am: d647097c74

Change-Id: I60c65481543f6b6ec698419d08b94877717783ff

7 years agoMerge "Add missing extension length check while parsing BNEP control packets" into...
Pavlin Radoslavov [Tue, 18 Jul 2017 18:55:45 +0000 (18:55 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am: fdcad53f8e
am: fd94c15a5a

Change-Id: I635b78d48c94608adb9a1ef784bf5884f64610a3

7 years agoFree p_pending_data from tBNEP_CONN to avoid potential memory leaks am: 8f18afd26c
Pavlin Radoslavov [Tue, 18 Jul 2017 18:55:33 +0000 (18:55 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am: 8f18afd26c
am: ffa87779a1

Change-Id: I4e93ec83fac0bfa764f7b78bf33d0ba088e5bc3a

7 years agoFree p_pending_data from tBNEP_CONN to avoid potential memory leaks am: f8fc7f7d11
Pavlin Radoslavov [Tue, 18 Jul 2017 18:55:33 +0000 (18:55 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am: f8fc7f7d11
am: 2b53cd05f2

Change-Id: I7de55b1c83bee83bed75b25c3ab6339a6341402b

7 years agoMerge "Add missing extension length check while parsing BNEP control packets" into...
Pavlin Radoslavov [Tue, 18 Jul 2017 18:51:27 +0000 (18:51 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev
am: fdcad53f8e

Change-Id: I3ae12cba736d90e70bb52888063304337550081c

7 years agoFree p_pending_data from tBNEP_CONN to avoid potential memory leaks
Pavlin Radoslavov [Tue, 18 Jul 2017 18:51:03 +0000 (18:51 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks
am: 8f18afd26c

Change-Id: I23886b18719d28ef3ae397ec6444b9e2692885e8

7 years agoMerge "Add missing extension length check while parsing BNEP control packets" into...
Pavlin Radoslavov [Tue, 18 Jul 2017 18:50:50 +0000 (18:50 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into nyc-dev
am: c3619e1436

Change-Id: Iab6a952226fae34db9f34192312839c03cb800d7

7 years agoFree p_pending_data from tBNEP_CONN to avoid potential memory leaks
Pavlin Radoslavov [Tue, 18 Jul 2017 18:50:36 +0000 (18:50 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks
am: f8fc7f7d11

Change-Id: Ib41c89b0070c24eb22576bc6536a5b63d19406a7

7 years agoMerge "Add missing extension length check while parsing BNEP control packets" into...
TreeHugger Robot [Tue, 18 Jul 2017 18:46:45 +0000 (18:46 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev

7 years agoMerge "Add missing extension length check while parsing BNEP control packets" into...
TreeHugger Robot [Tue, 18 Jul 2017 18:45:57 +0000 (18:45 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into nyc-dev

7 years agoMerge "Add missing extension length check while parsing BNEP control packets" into...
TreeHugger Robot [Tue, 18 Jul 2017 18:45:12 +0000 (18:45 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into oc-dev

7 years agoAdd missing extension length check while parsing BNEP control packets
Pavlin Radoslavov [Tue, 18 Jul 2017 01:12:10 +0000 (18:12 -0700)]
Add missing extension length check while parsing BNEP control packets

Bug: 63146237
Test: External script
Change-Id: I4e519cec1c7dffb8bd42add00bd891e0969a3d9f
(cherry picked from commit 9ab89b7dbe5735b796799f65144efa48595d0230)
(cherry picked from commit dc7700a43189d2a8607b69ae19a6d646f11ddf51)
(cherry picked from commit c7874f25a0557ca4413d8db80bab8da842fc389a)
(cherry picked from commit 187bd8aec0aae63c6328981041e5ec7764ece6a9)
(cherry picked from commit 01f46e0aff705dab350cda7f648fb94976ea3988)