git.osdn.net Git - android-x86/system-bt.git/log

(root) / android-x86 / system-bt.git / log

Martin Brabham [Fri, 31 May 2019 21:33:28 +0000 (14:33 -0700)]

[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: dff6cd84bc am: a52bfe5e60 skipped: 58d5d4b7f7 am: dc272a5302
am: 1422db72c6

Change-Id: I04b90889c8186f3e21b73729e0e8f8cd1b6b2e3b

commit | commitdiff | tree

Martin Brabham [Fri, 31 May 2019 21:25:24 +0000 (14:25 -0700)]

[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: dff6cd84bc am: a52bfe5e60 skipped: 58d5d4b7f7
am: dc272a5302

Change-Id: I8c85089522262e31ac3793184e34b28312750270

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 30 May 2019 16:56:02 +0000 (16:56 +0000)]

[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: dff6cd84bc am: a52bfe5e60 skipped: 58d5d4b7f7

Change-Id: I2e5ee164ea33bc6f845e34bc39a24f0080d9bbe9

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 30 May 2019 16:55:59 +0000 (16:55 +0000)]

[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: dff6cd84bc am: a52bfe5e60

Change-Id: I8d3abdacbf67c5f8cbd1cf3b1fb63528b4a95811

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 30 May 2019 16:55:56 +0000 (16:55 +0000)]

[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: dff6cd84bc

Change-Id: I3d8a71cad06115d2be87a8c8a6b961ffa2827709

commit | commitdiff | tree

Martin Brabham [Wed, 29 May 2019 19:16:59 +0000 (12:16 -0700)]

DO NOT MERGE: btif: require pairing dialog for JustWorks SSP

Bug: 110433804
Test: Manual; atest net_test_bluetooth
Change-Id: I84d50604dee67a01855228c72bb7e8d484de951c

commit | commitdiff | tree

Jakub Pawlowski [Wed, 29 May 2019 17:52:39 +0000 (10:52 -0700)]

[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am: a3cc7575f9 am: bb3fc48462 am: 9722c18caf am: c366796512 skipped: d1443d1913 am: e1fb3fdd61
am: a65c805c8c

Change-Id: I550868a91866949b0ee0e4d2f5d5031f079a824a

commit | commitdiff | tree

Jakub Pawlowski [Wed, 29 May 2019 17:48:40 +0000 (10:48 -0700)]

[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am: a3cc7575f9 am: bb3fc48462 am: 9722c18caf am: c366796512 skipped: d1443d1913
am: e1fb3fdd61

Change-Id: I802c3d22a7934f0d84dcbead758bfcad9195e401

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 28 May 2019 19:22:47 +0000 (19:22 +0000)]

[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am: a3cc7575f9 am: bb3fc48462 am: 9722c18caf am: c366796512 skipped: d1443d1913

Change-Id: I48d0148eb1a45e93105b3baf6a42ba91221fc402

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 28 May 2019 19:22:45 +0000 (19:22 +0000)]

[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am: a3cc7575f9 am: bb3fc48462 am: 9722c18caf am: c366796512

Change-Id: I1f9eb6a5010e8ffef7b7e0912b7f6ce81067ccec

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 28 May 2019 19:22:44 +0000 (19:22 +0000)]

[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am: a3cc7575f9 am: bb3fc48462 am: 9722c18caf

Change-Id: I040da3eb560786454a69d3230cf7d559a98c9818

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 28 May 2019 19:22:42 +0000 (19:22 +0000)]

[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am: a3cc7575f9 am: bb3fc48462

Change-Id: I5af312e49f6c6440ae31d8bb55d1ed3311a46e43

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 28 May 2019 19:22:40 +0000 (19:22 +0000)]

[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am: a3cc7575f9

Change-Id: Id63bf05a79287ec45942647075c715e858f915d1

commit | commitdiff | tree

Jakub Pawlowski [Fri, 24 May 2019 20:01:09 +0000 (22:01 +0200)]

DO NOT MERGE Send HCI Read Encryption Key properly

This patch fixes bad HCI command being send instead of Read Encryption
Key Size.

Bug: 124301137
Test: pair and connect with Bluetooth headset
Change-Id: If325ef2771ca1546ae58df7c684f66ae537b8573

commit | commitdiff | tree

Myles Watson [Fri, 10 May 2019 19:03:13 +0000 (12:03 -0700)]

[automerger skipped] Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev am: 3bf41c03e0
am: 6479bff4cf -s ours
am skip reason: change_id If8652936eb3b24b3d1b3fded0be200bb986b70e3 with SHA1 c0c3804acd is in history

Change-Id: I0e3438cb5090abcb65e4863ff725db2fe8b35f30

commit | commitdiff | tree

Myles Watson [Fri, 10 May 2019 19:01:54 +0000 (12:01 -0700)]

[automerger skipped] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: cd7bdf4cc3
am: 7316c97cd1 -s ours
am skip reason: change_id If8652936eb3b24b3d1b3fded0be200bb986b70e3 with SHA1 c0c3804acd is in history

Change-Id: If63f87a0300606a903bc8f7e9af6fb8e0ad708fd

commit | commitdiff | tree

Myles Watson [Fri, 10 May 2019 18:56:51 +0000 (11:56 -0700)]

Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev
am: 3bf41c03e0

Change-Id: Iea733c12789b381728a66f9de7c60c9420072cf1

commit | commitdiff | tree

Myles Watson [Fri, 10 May 2019 18:56:27 +0000 (11:56 -0700)]

Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
am: cd7bdf4cc3

Change-Id: I3f1d66a7c9da0740c0086d061a9cfc7c8ce0909a

commit | commitdiff | tree

TreeHugger Robot [Thu, 9 May 2019 20:20:23 +0000 (20:20 +0000)]

Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev

commit | commitdiff | tree

Myles Watson [Thu, 9 May 2019 20:12:39 +0000 (13:12 -0700)]

Merge changes from topic "am-52079082-d7b1-4194-aa18-1c17fa700e34" into oc-dev am: c322f3baa3
am: 7642947735

Change-Id: I5e720a69941ff5ce5873ed154fcd8fb6fde523e1

commit | commitdiff | tree

Myles Watson [Thu, 9 May 2019 20:11:31 +0000 (13:11 -0700)]

[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b am: 81488162eb am: 2f19a132c0 skipped: a328e6dc05 am: 2cef3d79da
am: dbad5b2a65

Change-Id: I14e32670ab2e0dbaa948585fe2952aecdb13b280

commit | commitdiff | tree

Myles Watson [Thu, 9 May 2019 19:33:12 +0000 (12:33 -0700)]

Merge changes from topic "am-52079082-d7b1-4194-aa18-1c17fa700e34" into oc-dev
am: c322f3baa3

Change-Id: I6b0940b2f486f0b433e0fda5274b10fc3b2b082d

commit | commitdiff | tree

Myles Watson [Thu, 9 May 2019 19:32:16 +0000 (12:32 -0700)]

[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b am: 81488162eb am: 2f19a132c0 skipped: a328e6dc05
am: 2cef3d79da

Change-Id: I6af0d17305a6fbede200e3ee0e1e951f0232ff01

commit | commitdiff | tree

TreeHugger Robot [Thu, 9 May 2019 18:49:48 +0000 (18:49 +0000)]

Merge changes from topic "am-52079082-d7b1-4194-aa18-1c17fa700e34" into nyc-mr2-dev

* changes:
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b am: 81488162eb am: 2f19a132c0
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b am: 81488162eb
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732
  Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"

commit | commitdiff | tree

TreeHugger Robot [Thu, 9 May 2019 18:49:48 +0000 (18:49 +0000)]

Merge changes from topic "am-52079082-d7b1-4194-aa18-1c17fa700e34" into cw-f-dev

* changes:
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b am: 81488162eb
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732
  Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"

commit | commitdiff | tree

TreeHugger Robot [Thu, 9 May 2019 18:49:48 +0000 (18:49 +0000)]

Merge changes from topic "am-52079082-d7b1-4194-aa18-1c17fa700e34" into nyc-mr1-dev

* changes:
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732
  Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"

commit | commitdiff | tree

TreeHugger Robot [Thu, 9 May 2019 18:49:48 +0000 (18:49 +0000)]

Merge changes from topic "am-52079082-d7b1-4194-aa18-1c17fa700e34" into nyc-dr1-dev

* changes:
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732
Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"

commit | commitdiff | tree

TreeHugger Robot [Thu, 9 May 2019 18:49:48 +0000 (18:49 +0000)]

Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 9 May 2019 18:49:48 +0000 (18:49 +0000)]

Merge changes from topic "am-52079082-d7b1-4194-aa18-1c17fa700e34" into oc-dev

* changes:
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b am: 81488162eb am: 2f19a132c0 skipped: a328e6dc05
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b am: 81488162eb am: 2f19a132c0
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b am: 81488162eb
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b
  [automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732
  Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"

commit | commitdiff | tree

TreeHugger Robot [Thu, 9 May 2019 18:47:49 +0000 (18:47 +0000)]

Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-mr1-dev

commit | commitdiff | tree

Martin Brabham [Wed, 8 May 2019 16:45:37 +0000 (09:45 -0700)]

Merge "DO NOT MERGE: osi: Offload mutex pointer to local scope" into oc-dev am: 99a0259cf3
am: dd2e11092a

Change-Id: I5dcb7baaf68e522a0604a30c53be5d61bf315a73

commit | commitdiff | tree

Martin Brabham [Wed, 8 May 2019 16:39:30 +0000 (09:39 -0700)]

Merge "DO NOT MERGE: osi: Offload mutex pointer to local scope" into oc-dev
am: 99a0259cf3

Change-Id: Ic593d9a4c421539181402c39860db5771a8f1417

commit | commitdiff | tree

TreeHugger Robot [Wed, 8 May 2019 16:30:02 +0000 (16:30 +0000)]

Merge "DO NOT MERGE: osi: Offload mutex pointer to local scope" into oc-dev

commit | commitdiff | tree

Ted Wang [Wed, 8 May 2019 04:26:09 +0000 (21:26 -0700)]

[automerger skipped] Merge "Fix potential OOB read in sdpu_get_len_from_type" into oc-dev am: cd20f25a79 -s ours
am: d76a5a7532 -s ours
am skip reason: change_id I3755e13ee0a7e22ffd5f48fca909610a26b09d0a with SHA1 08202bdcbe is in history

Change-Id: Ic1064df1d0f2d24d74e030112040e4b53101e7ba

commit | commitdiff | tree

Ted Wang [Wed, 8 May 2019 04:06:54 +0000 (21:06 -0700)]

[automerger skipped] Merge "Fix potential OOB read in sdpu_get_len_from_type" into oc-dev
am: cd20f25a79 -s ours
am skip reason: change_id I3755e13ee0a7e22ffd5f48fca909610a26b09d0a with SHA1 08202bdcbe is in history

Change-Id: I8465f167bb3054270c8ab3222835bca9096f8212

commit | commitdiff | tree

TreeHugger Robot [Wed, 8 May 2019 03:35:08 +0000 (03:35 +0000)]

Merge "Fix potential OOB read in sdpu_get_len_from_type" into oc-dev

commit | commitdiff | tree

Ted Wang [Tue, 7 May 2019 22:14:26 +0000 (15:14 -0700)]

[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am: 08202bdcbe am: d887336efe am: e26c142041 am: 9683021f70 skipped: d691b2dd00 am: 5c82fb9354
am: ee88b904c5

Change-Id: I1aa9a18fd7e1ccdcc89227d732a7ab758d62ae18

commit | commitdiff | tree

Ted Wang [Tue, 7 May 2019 22:01:21 +0000 (15:01 -0700)]

[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am: 08202bdcbe am: d887336efe am: e26c142041 am: 9683021f70 skipped: d691b2dd00
am: 5c82fb9354

Change-Id: Ia977c5381d95449adf2e20692c23dcd00c9b3fd9

commit | commitdiff | tree

Martin Brabham [Thu, 4 Apr 2019 21:57:41 +0000 (14:57 -0700)]

DO NOT MERGE: osi: Offload mutex pointer to local scope

Create a shared_ptr for the callback_mutex in the alarm struct.
When performing the callback, make a local shared_ptr reference.
lock_guard on the local shared_ptr reference.

Bug: 117997080
Test: atest net_test_bluetooth
Change-Id: Iab800f720f4ccc4735e4d494e0d458eb97b40a4a

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 6 May 2019 05:57:02 +0000 (05:57 +0000)]

[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am: 08202bdcbe am: d887336efe am: e26c142041 am: 9683021f70 skipped: d691b2dd00

Change-Id: I12681b184de3aaff511fcf29540b6cde73bc6ac2

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 6 May 2019 05:56:59 +0000 (05:56 +0000)]

[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am: 08202bdcbe am: d887336efe am: e26c142041 am: 9683021f70

Change-Id: I91346a746ce3342fc02c6a8afa82ed1904b374d7

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 6 May 2019 05:56:54 +0000 (05:56 +0000)]

[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am: 08202bdcbe am: d887336efe am: e26c142041

Change-Id: I8f91d03ebd8ce528acf076443400daed71b261aa

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 6 May 2019 05:56:49 +0000 (05:56 +0000)]

[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am: 08202bdcbe am: d887336efe

Change-Id: I854858463801fabb6b21bc6af67d794387c36b3e

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 6 May 2019 05:56:45 +0000 (05:56 +0000)]

[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am: 08202bdcbe

Change-Id: I79d94e8ba10a1f8e5f1657eaab36eacab4c6d0fb

commit | commitdiff | tree

Ted Wang [Mon, 29 Apr 2019 02:11:04 +0000 (10:11 +0800)]

DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type

Add boundary check in sdpu_get_len_from_type to prevent potential OOB read.

Bug: 117105007
Test: Manul
Merged-In: I3755e13ee0a7e22ffd5f48fca909610a26b09d0a
Change-Id: I3755e13ee0a7e22ffd5f48fca909610a26b09d0a

commit | commitdiff | tree

Ted Wang [Mon, 29 Apr 2019 02:11:04 +0000 (10:11 +0800)]

Fix potential OOB read in sdpu_get_len_from_type

Add boundary check in sdpu_get_len_from_type to prevent potential OOB read.

Bug: 117105007
Test: Manul
Merged-In: I3755e13ee0a7e22ffd5f48fca909610a26b09d0a
Change-Id: I3755e13ee0a7e22ffd5f48fca909610a26b09d0a
(cherry picked from commit 1243f8da338dadfe2a3c281a08297b431402d41c)

commit | commitdiff | tree

Myles Watson [Wed, 1 May 2019 18:31:36 +0000 (18:31 +0000)]

Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"

This reverts commit 09894418589479875443037c45e596824da90928.

Bug: 79703832
Bug: 130553855
Reason for revert: Regression with cross-key pairing

Change-Id: Idb732736c250a8ed375cce4f7b27669542ea70e2
Merged-In: If8652936eb3b24b3d1b3fded0be200bb986b70e3

commit | commitdiff | tree

Myles Watson [Wed, 1 May 2019 18:31:46 +0000 (18:31 +0000)]

Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"

This reverts commit f3681c8616af4d052c410ba3e88747541a974bf5.

Bug: 79703832
Bug: 130553855
Reason for revert: Regression with cross-key pairing

Change-Id: If8652936eb3b24b3d1b3fded0be200bb986b70e3

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 1 May 2019 18:28:23 +0000 (18:28 +0000)]

[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b am: 81488162eb am: 2f19a132c0 skipped: a328e6dc05

Change-Id: I7751a160ac79d810e5e8f2a545f7887ab2cfe756

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 1 May 2019 18:28:22 +0000 (18:28 +0000)]

[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b am: 81488162eb am: 2f19a132c0

Change-Id: Ifc01741e99c7912c459ee9178c1c8533599df240

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 1 May 2019 18:28:20 +0000 (18:28 +0000)]

[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b am: 81488162eb

Change-Id: If67e79b47e46c5808dff364e9a51da247e2c82f3

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 1 May 2019 18:28:18 +0000 (18:28 +0000)]

[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732 am: ea5e81480b

Change-Id: Idd6c2e065049ae432ecc44069c4344c97e46d8de

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 1 May 2019 18:28:16 +0000 (18:28 +0000)]

[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am: eed7f80732

Change-Id: I1a5218347cd6039a1aa48f304a55e2cce6b5d179

commit | commitdiff | tree

Myles Watson [Wed, 1 May 2019 18:28:13 +0000 (18:28 +0000)]

Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"

This reverts commit edd7e731edad067fe08b0623be6b2745bf81a445.

Bug: 79703832
Bug: 130553855
Reason for revert: Regression with cross-key pairing

Change-Id: I78f523b930d1433e39fc900d703f2317518a8b39

commit | commitdiff | tree

Jakub Pawlowski [Mon, 8 Apr 2019 13:00:22 +0000 (06:00 -0700)]

[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK am: 292fcf8612 -s ours
am: e8dea68f6a -s ours
am skip reason: change_id I52fd484d42bf87e96dbc9e6456090f231ed48111 with SHA1 c0fb2a25f9 is in history

Change-Id: If68cf83db0a7388146f4e28a8433f8bd4c402e72

commit | commitdiff | tree

Jakub Pawlowski [Mon, 8 Apr 2019 12:55:18 +0000 (05:55 -0700)]

[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK
am: 292fcf8612 -s ours
am skip reason: change_id I52fd484d42bf87e96dbc9e6456090f231ed48111 with SHA1 c0fb2a25f9 is in history

Change-Id: I923523630e1e8530f23f3720611582353ffecff4

commit | commitdiff | tree

Jakub Pawlowski [Mon, 11 Mar 2019 18:22:01 +0000 (19:22 +0100)]

DO NOT MERGE Don't persist bonds using sample LTK

Test: compilation, manual testing
Bug: 128843052
Merged-In: I52fd484d42bf87e96dbc9e6456090f231ed48111
Change-Id: I52fd484d42bf87e96dbc9e6456090f231ed48111

commit | commitdiff | tree

Jakub Pawlowski [Fri, 5 Apr 2019 23:23:05 +0000 (16:23 -0700)]

[automerger] DO NOT MERGE Don't persist bonds using sample LTK am: c0fb2a25f9 am: c544656a68 am: 0fd5b5de7d am: 1dec8a9f3e skipped: 05e4e07328 am: c07f304de8
am: fc58eb3c8d

Change-Id: I346917706000054f0aee3bc3084f60e15b7a4f57

commit | commitdiff | tree

Jakub Pawlowski [Fri, 5 Apr 2019 21:27:01 +0000 (14:27 -0700)]

[automerger] DO NOT MERGE Don't persist bonds using sample LTK am: c0fb2a25f9 am: c544656a68 am: 0fd5b5de7d am: 1dec8a9f3e skipped: 05e4e07328
am: c07f304de8

Change-Id: I20eed1aeb29a3df15251033d02fd7d5d241a28dd

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 1 Apr 2019 18:14:30 +0000 (18:14 +0000)]

[automerger] DO NOT MERGE Don't persist bonds using sample LTK am: c0fb2a25f9 am: c544656a68 am: 0fd5b5de7d am: 1dec8a9f3e skipped: 05e4e07328

Change-Id: Ia5e85f456ba202b1562b8f6fc2f3481f7a999691

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 1 Apr 2019 18:14:23 +0000 (18:14 +0000)]

[automerger] DO NOT MERGE Don't persist bonds using sample LTK am: c0fb2a25f9 am: c544656a68 am: 0fd5b5de7d am: 1dec8a9f3e

Change-Id: I6d433ec513e6f04b8e117a08a9ce5bebdd42d8d4

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 1 Apr 2019 18:14:19 +0000 (18:14 +0000)]

[automerger] DO NOT MERGE Don't persist bonds using sample LTK am: c0fb2a25f9 am: c544656a68 am: 0fd5b5de7d

Change-Id: Idf19ab0fdf1da993701a6b24d47fccc982f3e2ff

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 1 Apr 2019 18:14:16 +0000 (18:14 +0000)]

[automerger] DO NOT MERGE Don't persist bonds using sample LTK am: c0fb2a25f9 am: c544656a68

Change-Id: I21c8af012049cbf87adc90f1e3e46f47baddbca5

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 1 Apr 2019 18:14:13 +0000 (18:14 +0000)]

[automerger] DO NOT MERGE Don't persist bonds using sample LTK am: c0fb2a25f9

Change-Id: I2a44d852ccb88db0bf360ae094d240ca64e50a94

commit | commitdiff | tree

Jakub Pawlowski [Mon, 11 Mar 2019 18:22:01 +0000 (19:22 +0100)]

DO NOT MERGE Don't persist bonds using sample LTK

Test: compilation, manual testing
Bug: 128843052
Change-Id: I52fd484d42bf87e96dbc9e6456090f231ed48111

commit | commitdiff | tree

Jakub Pawlowski [Mon, 11 Mar 2019 18:22:01 +0000 (19:22 +0100)]

DO NOT MERGE Don't persist bonds using sample LTK

Test: compilation, manual testing
Bug: 128843052
Change-Id: I52fd484d42bf87e96dbc9e6456090f231ed48111

commit | commitdiff | tree

Jakub Pawlowski [Tue, 26 Mar 2019 23:14:42 +0000 (16:14 -0700)]

[automerger skipped] DO NOT MERGE Drop Bluetooth connection with weak encryption key am: 049bf4ec4e -s ours
am: 5237f6add3 -s ours
am skip reason: change_id Id4b6b4e765628397a79e6806f45c2cd27acebd5b with SHA1 027532b367 is in history

Change-Id: I56780086be9ba71ee573956d0991824db7ebba0f

commit | commitdiff | tree

Jakub Pawlowski [Tue, 26 Mar 2019 23:14:08 +0000 (16:14 -0700)]

[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am: 027532b367 am: 5f48bc8a86 am: b788f8394e am: a46c2b03a2 skipped: f0213c3937 am: 1ecc29885a
am: 262bb16a7e

Change-Id: Iebb2f610252f8cec64ea7003fd1955d30b7fcf79

commit | commitdiff | tree

Jakub Pawlowski [Tue, 26 Mar 2019 23:02:58 +0000 (16:02 -0700)]

[automerger skipped] DO NOT MERGE Drop Bluetooth connection with weak encryption key
am: 049bf4ec4e -s ours
am skip reason: change_id Id4b6b4e765628397a79e6806f45c2cd27acebd5b with SHA1 027532b367 is in history

Change-Id: I9f7f56c8620a99ce5f2a4bf0e33eb94cdac829a5

commit | commitdiff | tree

Jakub Pawlowski [Tue, 26 Mar 2019 22:10:24 +0000 (15:10 -0700)]

[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am: 027532b367 am: 5f48bc8a86 am: b788f8394e am: a46c2b03a2 skipped: f0213c3937
am: 1ecc29885a

Change-Id: I43f7d01e376f8260e1120d3a403c41f45eca5950

commit | commitdiff | tree

Jakub Pawlowski [Thu, 14 Feb 2019 11:44:06 +0000 (12:44 +0100)]

DO NOT MERGE Drop Bluetooth connection with weak encryption key

This patch requires Bluetooth chip to support HCI Read Encryption Key Size
command and will cause Bluetooth to crash if this command is not supported
on a device. Such device should not take this patch and should look for
alternative solution to drop Bluetooth connection with weak encryption key.

Bug: 124301137
Merged-In: Id4b6b4e765628397a79e6806f45c2cd27acebd5b
Change-Id: Id4b6b4e765628397a79e6806f45c2cd27acebd5b

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 22 Mar 2019 18:30:05 +0000 (18:30 +0000)]

[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am: 027532b367 am: 5f48bc8a86 am: b788f8394e am: a46c2b03a2 skipped: f0213c3937

Change-Id: I028d493ce2aae117a28422b68df67dd424b28148

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 22 Mar 2019 18:30:03 +0000 (18:30 +0000)]

[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am: 027532b367 am: 5f48bc8a86 am: b788f8394e am: a46c2b03a2

Change-Id: I203993fecd15608d036b79ae9f1bcf1e6e5536b1

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 22 Mar 2019 18:30:01 +0000 (18:30 +0000)]

[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am: 027532b367 am: 5f48bc8a86 am: b788f8394e

Change-Id: Iebe131904b01492285eaaeaf6408b76037b2643e

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 22 Mar 2019 18:29:58 +0000 (18:29 +0000)]

[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am: 027532b367 am: 5f48bc8a86

Change-Id: Ia0fb7cb6c331f4f30b4a2320fa52b66be425c74f

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 22 Mar 2019 18:29:56 +0000 (18:29 +0000)]

[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am: 027532b367

Change-Id: I4fb660ac5ca288993e6f0643929eb1b1def1040c

commit | commitdiff | tree

Jakub Pawlowski [Thu, 14 Feb 2019 11:44:06 +0000 (12:44 +0100)]

DO NOT MERGE Drop Bluetooth connection with weak encryption key

This patch requires Bluetooth chip to support HCI Read Encryption Key Size
command and will cause Bluetooth to crash if this command is not supported
on a device. Such device should not take this patch and should look for
alternative solution to drop Bluetooth connection with weak encryption key.

Bug: 124301137
Change-Id: Id4b6b4e765628397a79e6806f45c2cd27acebd5b

commit | commitdiff | tree

Jakub Pawlowski [Thu, 14 Feb 2019 11:44:06 +0000 (12:44 +0100)]

DO NOT MERGE Drop Bluetooth connection with weak encryption key

This patch requires Bluetooth chip to support HCI Read Encryption Key Size
command and will cause Bluetooth to crash if this command is not supported
on a device. Such device should not take this patch and should look for
alternative solution to drop Bluetooth connection with weak encryption key.

Bug: 124301137
Change-Id: Id4b6b4e765628397a79e6806f45c2cd27acebd5b

commit | commitdiff | tree

Hansong Zhang [Fri, 8 Mar 2019 00:09:35 +0000 (16:09 -0800)]

[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am: 1fa0f29dbe am: 066e401178 am: c97a452b7c am: a2661852ce skipped: 3c413e34d2 am: ec1eca1dfb
am: 294210a1a2

Change-Id: I770c49c0620e4267d2134abbecc8b55193149227

commit | commitdiff | tree

Hansong Zhang [Thu, 7 Mar 2019 23:22:20 +0000 (15:22 -0800)]

[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am: 1fa0f29dbe am: 066e401178 am: c97a452b7c am: a2661852ce skipped: 3c413e34d2
am: ec1eca1dfb

Change-Id: I8d891af970d9eea45384eff2967544adb6ffafc7

commit | commitdiff | tree

TreeHugger Robot [Thu, 7 Mar 2019 23:04:58 +0000 (23:04 +0000)]

Merge "DO NOT MERGE Fix length for L2CAP config type EXT FLOW" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 7 Mar 2019 18:51:47 +0000 (18:51 +0000)]

[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am: 1fa0f29dbe am: 066e401178 am: c97a452b7c am: a2661852ce skipped: 3c413e34d2

Change-Id: I5f0ad541fa702233322b96e5dd5c9d53233dea94

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 7 Mar 2019 18:51:45 +0000 (18:51 +0000)]

[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am: 1fa0f29dbe am: 066e401178 am: c97a452b7c am: a2661852ce

Change-Id: I6e56a6c02e5d7a3e23832c8e24550ae626a4dc6a

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 7 Mar 2019 18:51:43 +0000 (18:51 +0000)]

[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am: 1fa0f29dbe am: 066e401178 am: c97a452b7c

Change-Id: I747585195e3cf9137449dc777b64174a4a93c1f3

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 7 Mar 2019 18:51:42 +0000 (18:51 +0000)]

[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am: 1fa0f29dbe am: 066e401178

Change-Id: Ie35b3f093063898bc9d8cab84d221194f1ca007b

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 7 Mar 2019 18:51:38 +0000 (18:51 +0000)]

[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am: 1fa0f29dbe

Change-Id: I24f0d31be7582e28ba9b96d836cd85bcf7f3ef4c

commit | commitdiff | tree

Hansong Zhang [Thu, 7 Mar 2019 18:50:04 +0000 (10:50 -0800)]

DO NOT MERGE Fix length for L2CAP config type EXT FLOW

Bug: 119870451
Test: POC
Change-Id: I11041dd03caad5569e930ff36b50fc9c2719c57f

commit | commitdiff | tree

Ugo Yu [Fri, 8 Feb 2019 20:38:28 +0000 (12:38 -0800)]

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am: 99495df519 -s ours
am: 8d550cccd6 -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1 f3681c8616 is in history

Change-Id: Iaf7c1aadcfd65ed6a82b0c3bc98ff121046f70d2

commit | commitdiff | tree

Ugo Yu [Fri, 8 Feb 2019 20:37:26 +0000 (12:37 -0800)]

[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 0989441858 -s ours
am: a6d6406255 -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1 f3681c8616 is in history

Change-Id: Ie5679c43d4e59f3028a115558763baae8d31ec73

commit | commitdiff | tree

Ugo Yu [Fri, 8 Feb 2019 20:34:11 +0000 (12:34 -0800)]

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev
am: 99495df519 -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1 0989441858 is in history

Change-Id: I6fb78cdd8f4c748d6cafa85bdb1f8f60d676373b

commit | commitdiff | tree

Ugo Yu [Fri, 8 Feb 2019 20:33:37 +0000 (12:33 -0800)]

[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2)
am: 0989441858 -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1 edd7e731ed is in history

Change-Id: Ied8e02f8c14ed6190cc9baebf688359d682b6d00

commit | commitdiff | tree

TreeHugger Robot [Fri, 8 Feb 2019 20:19:42 +0000 (20:19 +0000)]

Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev

commit | commitdiff | tree

Ugo Yu [Fri, 8 Feb 2019 08:10:13 +0000 (00:10 -0800)]

Merge changes from topic "am-43952131-a4db-4e42-bfef-2d44a29b3fac" into oc-dev am: c59317a10a
am: d73d5ace07

Change-Id: I276abc4b3d069c7700e37cf6c2a34df380b07035

commit | commitdiff | tree

Ugo Yu [Fri, 8 Feb 2019 08:06:25 +0000 (00:06 -0800)]

Merge changes from topic "am-43952131-a4db-4e42-bfef-2d44a29b3fac" into oc-dev
am: c59317a10a

Change-Id: I424449c094db3c75d1f76f7d397b7b510d1a8959

commit | commitdiff | tree