OSDN Git Service

android-x86/system-bt.git
5 years ago[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am: a3cc7575f9 am...
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

5 years ago[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am: a3cc7575f9 am...
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

5 years ago[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am: a3cc7575f9 am...
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

5 years ago[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am: a3cc7575f9 am...
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

5 years ago[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am: a3cc7575f9 am...
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

5 years ago[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am: a3cc7575f9
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

5 years agoDO NOT MERGE Send HCI Read Encryption Key properly
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

5 years agoMerge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into...
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

5 years agoRevert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
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

5 years agoMerge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into...
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

5 years agoMerge changes from topic "am-52079082-d7b1-4194-aa18-1c17fa700e34" into oc-dev
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

5 years ago[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2...
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

5 years agoMerge changes from topic "am-52079082-d7b1-4194-aa18-1c17fa700e34" into nyc-mr2-dev
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)"

5 years agoMerge changes from topic "am-52079082-d7b1-4194-aa18-1c17fa700e34" into cw-f-dev
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)"

5 years agoMerge changes from topic "am-52079082-d7b1-4194-aa18-1c17fa700e34" into nyc-mr1-dev
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)"

5 years agoMerge changes from topic "am-52079082-d7b1-4194-aa18-1c17fa700e34" into nyc-dr1-dev
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)"

5 years agoMerge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into...
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

5 years agoMerge changes from topic "am-52079082-d7b1-4194-aa18-1c17fa700e34" into oc-dev
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)"

5 years agoMerge "DO NOT MERGE: osi: Offload mutex pointer to local scope" into oc-dev
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

5 years agoMerge "DO NOT MERGE: osi: Offload mutex pointer to local scope" into oc-dev
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

5 years ago[automerger skipped] Merge "Fix potential OOB read in sdpu_get_len_from_type" into...
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

5 years agoMerge "Fix potential OOB read in sdpu_get_len_from_type" into oc-dev
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

5 years ago[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am: 08202b...
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

5 years agoDO NOT MERGE: osi: Offload mutex pointer to local scope
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

5 years ago[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am: 08202b...
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

5 years ago[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am: 08202b...
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

5 years ago[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am: 08202b...
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

5 years ago[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am: 08202b...
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

5 years ago[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am: 08202bdcbe
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

5 years agoDO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type
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

5 years agoFix potential OOB read in sdpu_get_len_from_type
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)

5 years agoRevert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
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

5 years ago[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2...
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

5 years ago[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2...
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

5 years ago[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2...
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

5 years ago[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2...
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

5 years ago[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2...
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

5 years agoRevert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
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

5 years ago[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK
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

5 years agoDO NOT MERGE Don't persist bonds using sample LTK
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

5 years ago[automerger] DO NOT MERGE Don't persist bonds using sample LTK am: c0fb2a25f9 am...
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

5 years ago[automerger] DO NOT MERGE Don't persist bonds using sample LTK am: c0fb2a25f9 am...
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

5 years ago[automerger] DO NOT MERGE Don't persist bonds using sample LTK am: c0fb2a25f9 am...
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

5 years ago[automerger] DO NOT MERGE Don't persist bonds using sample LTK am: c0fb2a25f9 am...
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

5 years ago[automerger] DO NOT MERGE Don't persist bonds using sample LTK am: c0fb2a25f9 am...
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

5 years ago[automerger] DO NOT MERGE Don't persist bonds using sample LTK am: c0fb2a25f9
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

5 years agoDO NOT MERGE Don't persist bonds using sample LTK
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

5 years ago[automerger skipped] DO NOT MERGE Drop Bluetooth connection with weak encryption key
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

5 years ago[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:...
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

5 years agoDO NOT MERGE Drop Bluetooth connection with weak encryption key
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

5 years ago[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:...
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

5 years ago[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:...
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

5 years ago[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:...
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

5 years ago[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:...
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

5 years ago[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:...
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

5 years agoDO NOT MERGE Drop Bluetooth connection with weak encryption key
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

5 years ago[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am: 1fa0f29dbe...
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

5 years agoMerge "DO NOT MERGE Fix length for L2CAP config type EXT FLOW" into nyc-dev
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

5 years ago[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am: 1fa0f29dbe...
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

5 years ago[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am: 1fa0f29dbe...
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

5 years ago[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am: 1fa0f29dbe...
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

5 years ago[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am: 1fa0f29dbe...
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

5 years ago[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am: 1fa0f29dbe
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

5 years agoDO NOT MERGE Fix length for L2CAP config type EXT FLOW
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

5 years ago[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state...
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

5 years ago[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2)
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

5 years agoMerge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev
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

5 years agoMerge changes from topic "am-43952131-a4db-4e42-bfef-2d44a29b3fac" into oc-dev
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

5 years agoMerge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into nyc-dev
TreeHugger Robot [Fri, 8 Feb 2019 07:54:10 +0000 (07:54 +0000)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into nyc-dev

5 years agoMerge changes from topic "am-43952131-a4db-4e42-bfef-2d44a29b3fac" into nyc-mr2-dev
TreeHugger Robot [Fri, 8 Feb 2019 07:54:10 +0000 (07:54 +0000)]
Merge changes from topic "am-43952131-a4db-4e42-bfef-2d44a29b3fac" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: edd7e731ed am: 279c2a1910 am: c29c3aa408 am: 70ab44a424
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: edd7e731ed am: 279c2a1910 am: c29c3aa408
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: edd7e731ed am: 279c2a1910
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: edd7e731ed
  DO NOT MERGE Separate SDP procedure from bonding state (1/2)

5 years agoMerge changes from topic "am-43952131-a4db-4e42-bfef-2d44a29b3fac" into cw-f-dev
TreeHugger Robot [Fri, 8 Feb 2019 07:54:10 +0000 (07:54 +0000)]
Merge changes from topic "am-43952131-a4db-4e42-bfef-2d44a29b3fac" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: edd7e731ed am: 279c2a1910 am: c29c3aa408
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: edd7e731ed am: 279c2a1910
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: edd7e731ed
  DO NOT MERGE Separate SDP procedure from bonding state (1/2)

5 years agoMerge changes from topic "am-43952131-a4db-4e42-bfef-2d44a29b3fac" into nyc-mr1-dev
TreeHugger Robot [Fri, 8 Feb 2019 07:54:10 +0000 (07:54 +0000)]
Merge changes from topic "am-43952131-a4db-4e42-bfef-2d44a29b3fac" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: edd7e731ed am: 279c2a1910
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: edd7e731ed
  DO NOT MERGE Separate SDP procedure from bonding state (1/2)

5 years agoMerge changes from topic "am-43952131-a4db-4e42-bfef-2d44a29b3fac" into nyc-dr1-dev
TreeHugger Robot [Fri, 8 Feb 2019 07:54:10 +0000 (07:54 +0000)]
Merge changes from topic "am-43952131-a4db-4e42-bfef-2d44a29b3fac" into nyc-dr1-dev

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

5 years agoMerge changes from topic "am-43952131-a4db-4e42-bfef-2d44a29b3fac" into oc-dev
TreeHugger Robot [Fri, 8 Feb 2019 07:54:10 +0000 (07:54 +0000)]
Merge changes from topic "am-43952131-a4db-4e42-bfef-2d44a29b3fac" into oc-dev

* changes:
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: edd7e731ed am: 279c2a1910 am: c29c3aa408 am: 70ab44a424 skipped: 4e26a1fa5d
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: edd7e731ed am: 279c2a1910 am: c29c3aa408 am: 70ab44a424
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: edd7e731ed am: 279c2a1910 am: c29c3aa408
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: edd7e731ed am: 279c2a1910
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: edd7e731ed
  DO NOT MERGE Separate SDP procedure from bonding state (1/2)

5 years agoMerge "btm_proc_smp_cback: Don't access p_dev_rec if freed" into oc-dev
Hansong Zhang [Fri, 8 Feb 2019 00:42:12 +0000 (16:42 -0800)]
Merge "btm_proc_smp_cback: Don't access p_dev_rec if freed" into oc-dev
am: 4ac889b785

Change-Id: I3a99684487593468b89948aa9d3be99e5ed705f4

5 years agoMerge "btm_proc_smp_cback: Don't access p_dev_rec if freed" into oc-dev
TreeHugger Robot [Fri, 8 Feb 2019 00:31:40 +0000 (00:31 +0000)]
Merge "btm_proc_smp_cback: Don't access p_dev_rec if freed" into oc-dev

5 years agoMerge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into oc-dev
Hansong Zhang [Thu, 7 Feb 2019 21:17:35 +0000 (13:17 -0800)]
Merge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into oc-dev
am: e145805974

Change-Id: Iaa78778cedd6e04d3cf7d009b81a9599658e6583

5 years agoMerge "DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed" into nyc-dev
TreeHugger Robot [Thu, 7 Feb 2019 21:07:56 +0000 (21:07 +0000)]
Merge "DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed" into nyc-dev

5 years agoMerge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into nyc-mr2-dev
TreeHugger Robot [Thu, 7 Feb 2019 21:07:56 +0000 (21:07 +0000)]
Merge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: 74c6d501ce am: 059e3c77e2 am: a244a4072c am: 90265d4ee0
  [automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: 74c6d501ce am: 059e3c77e2 am: a244a4072c
  [automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: 74c6d501ce am: 059e3c77e2
  [automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: 74c6d501ce
  DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed

5 years agoMerge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into cw-f-dev
TreeHugger Robot [Thu, 7 Feb 2019 21:07:56 +0000 (21:07 +0000)]
Merge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: 74c6d501ce am: 059e3c77e2 am: a244a4072c
  [automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: 74c6d501ce am: 059e3c77e2
  [automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: 74c6d501ce
  DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed

5 years agoMerge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into nyc-mr1-dev
TreeHugger Robot [Thu, 7 Feb 2019 21:07:56 +0000 (21:07 +0000)]
Merge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: 74c6d501ce am: 059e3c77e2
  [automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: 74c6d501ce
  DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed

5 years agoMerge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into nyc-dr1-dev
TreeHugger Robot [Thu, 7 Feb 2019 21:07:56 +0000 (21:07 +0000)]
Merge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into nyc-dr1-dev

* changes:
  [automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: 74c6d501ce
  DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed

5 years agoMerge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into oc-dev
TreeHugger Robot [Thu, 7 Feb 2019 21:07:56 +0000 (21:07 +0000)]
Merge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into oc-dev

* changes:
  [automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: 74c6d501ce am: 059e3c77e2 am: a244a4072c am: 90265d4ee0 skipped: 84ba34d57a
  [automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: 74c6d501ce am: 059e3c77e2 am: a244a4072c am: 90265d4ee0
  [automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: 74c6d501ce am: 059e3c77e2 am: a244a4072c
  [automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: 74c6d501ce am: 059e3c77e2
  [automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: 74c6d501ce
  DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed

5 years agoMerge changes from topic "am-cdd47550-8877-443a-826f-db2b25d750ce" into oc-dev
Hansong Zhang [Sat, 2 Feb 2019 08:05:14 +0000 (00:05 -0800)]
Merge changes from topic "am-cdd47550-8877-443a-826f-db2b25d750ce" into oc-dev
am: 8ea254e227

Change-Id: Ifc5a20abe1c8091f4850cd3d75f9ecfb4474f11e

5 years agoMerge "DO NOT MERGE process_l2cap_cmd: Fix OOB" into nyc-dev
TreeHugger Robot [Sat, 2 Feb 2019 07:52:13 +0000 (07:52 +0000)]
Merge "DO NOT MERGE process_l2cap_cmd: Fix OOB" into nyc-dev

5 years agoMerge changes from topic "am-cdd47550-8877-443a-826f-db2b25d750ce" into oc-dev
TreeHugger Robot [Sat, 2 Feb 2019 07:52:13 +0000 (07:52 +0000)]
Merge changes from topic "am-cdd47550-8877-443a-826f-db2b25d750ce" into oc-dev

* changes:
  [automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am: 38f07a3c93 am: 14f6578d9e am: 53e323b2af am: d0584f3dcf skipped: 55b702e6c4
  [automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am: 38f07a3c93 am: 14f6578d9e am: 53e323b2af am: d0584f3dcf
  [automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am: 38f07a3c93 am: 14f6578d9e am: 53e323b2af
  [automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am: 38f07a3c93 am: 14f6578d9e
  [automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am: 38f07a3c93
  DO NOT MERGE process_l2cap_cmd: Fix OOB

5 years agoMerge "process_l2cap_cmd: Fix OOB" into oc-dev
Hansong Zhang [Fri, 1 Feb 2019 23:33:09 +0000 (15:33 -0800)]
Merge "process_l2cap_cmd: Fix OOB" into oc-dev
am: 356edb4333

Change-Id: I0e1800587513bdb39e0b6eff7e46254470ab2def

5 years agoMerge "process_l2cap_cmd: Fix OOB" into oc-dev
TreeHugger Robot [Fri, 1 Feb 2019 23:18:22 +0000 (23:18 +0000)]
Merge "process_l2cap_cmd: Fix OOB" into oc-dev

5 years agoMerge "btm_ble_multi_adv: Check data length in HCI interface" into oc-dev
Hansong Zhang [Wed, 30 Jan 2019 00:49:16 +0000 (16:49 -0800)]
Merge "btm_ble_multi_adv: Check data length in HCI interface" into oc-dev
am: 19460901d8

Change-Id: If4f3b40817ff57bdae4777ae330854a9119ae0b7

5 years agoMerge "btm_ble_multi_adv: Check data length in HCI interface" into oc-dev
TreeHugger Robot [Wed, 30 Jan 2019 00:25:28 +0000 (00:25 +0000)]
Merge "btm_ble_multi_adv: Check data length in HCI interface" into oc-dev

5 years ago[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am...
Android Build Merger (Role) [Tue, 22 Jan 2019 21:47:38 +0000 (21:47 +0000)]
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: 74c6d501ce am: 059e3c77e2 am: a244a4072c am: 90265d4ee0 skipped: 84ba34d57a

Change-Id: I73f54778128ee9bf1ed46c55bbd545b29ed2dc54

5 years ago[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am...
Android Build Merger (Role) [Tue, 22 Jan 2019 21:47:36 +0000 (21:47 +0000)]
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: 74c6d501ce am: 059e3c77e2 am: a244a4072c am: 90265d4ee0

Change-Id: I080739b77c52af5ff54bfc4e8a20cf8fd52b235b

5 years ago[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am...
Android Build Merger (Role) [Tue, 22 Jan 2019 21:47:35 +0000 (21:47 +0000)]
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: 74c6d501ce am: 059e3c77e2 am: a244a4072c

Change-Id: Ic43337c91c1cdcb9eaea22311cd7205dc05dcfa2

5 years agobtm_proc_smp_cback: Don't access p_dev_rec if freed
Hansong Zhang [Thu, 10 Jan 2019 02:18:17 +0000 (18:18 -0800)]
btm_proc_smp_cback: Don't access p_dev_rec if freed

In btm_proc_smp_cback(), return after p_dev_rec is freed in the middle
to prevent use after free

Bug: 120612744
Test: Use ASAN build; connect to a LE device and wait for timeout
Change-Id: Ic9d0eaeb62a1a1b24884146ca82f4104fabc5bac

5 years ago[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am...
Android Build Merger (Role) [Tue, 22 Jan 2019 21:47:33 +0000 (21:47 +0000)]
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: 74c6d501ce am: 059e3c77e2

Change-Id: I96de72b97a23eebad116c98899f59f399614cff7

5 years ago[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am...
Android Build Merger (Role) [Tue, 22 Jan 2019 21:47:32 +0000 (21:47 +0000)]
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am: 74c6d501ce

Change-Id: Iad8449f422afb55305d3f1f2a148a4122c49c7d8

5 years agoDO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed
Hansong Zhang [Tue, 22 Jan 2019 21:46:47 +0000 (13:46 -0800)]
DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed

In btm_proc_smp_cback(), return after p_dev_rec is freed in the middle
to prevent use after free

Bug: 120612744
Test: Use ASAN build; connect to a LE device and wait for timeout
Change-Id: I09aa1cf1d1c835146b62d0f4989aeedfb885d95b

5 years ago[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am: 38f07a3c93 am: 14f6578d9e...
Android Build Merger (Role) [Tue, 22 Jan 2019 18:47:24 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am: 38f07a3c93 am: 14f6578d9e am: 53e323b2af am: d0584f3dcf skipped: 55b702e6c4

Change-Id: If1fb97bc56d2ed652f56f1f962aea1d00843543e

5 years ago[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am: 38f07a3c93 am: 14f6578d9e...
Android Build Merger (Role) [Tue, 22 Jan 2019 18:47:22 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am: 38f07a3c93 am: 14f6578d9e am: 53e323b2af am: d0584f3dcf

Change-Id: I101a465864f054989085bba0ccf2fc633445f356

5 years ago[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am: 38f07a3c93 am: 14f6578d9e...
Android Build Merger (Role) [Tue, 22 Jan 2019 18:47:20 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am: 38f07a3c93 am: 14f6578d9e am: 53e323b2af

Change-Id: I9a919a3168f0d37834a14778c3f24f1e5f417685