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

OSDN Git Service

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

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

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

[automerger skipped] [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
am: 6e197e9332 -s ours
am skip reason: subject contains skip directive

Change-Id: I34a6387c4d3eb5eebe2a94b6ec84a409a6f20808

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

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

[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK am: 292fcf8612 -s ours am: e8dea68f6a -s ours
am: dc17388efd -s ours
am skip reason: subject contains skip directive

Change-Id: I368bf6dcf1599b50fce99a9c55fb25bc896996cb

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:25:51 +0000 (16:25 -0700)]

[automerger skipped] [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
am: 97e9e1540a -s ours
am skip reason: subject contains skip directive

Change-Id: Ib1c23383e61d4faca8970cad71fa8f24dd2e354c

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 23:03:40 +0000 (16:03 -0700)]

[automerger skipped] DO NOT MERGE Don't persist bonds using sample LTK
am: 054dcec1c9 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib7be32bd6046f7fce608fc0bef9d812ab6341b2a

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 [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

TreeHugger Robot [Wed, 27 Mar 2019 05:09:25 +0000 (05:09 +0000)]

Merge "DO NOT MERGE Log encryption key size" into pi-dev

commit | commitdiff | tree

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

[automerger skipped] DO NOT MERGE Drop Bluetooth connection with weak encryption key am: 049bf4ec4e -s ours am: 5237f6add3 -s ours
am: 6caf0b031f -s ours
am skip reason: subject contains skip directive

Change-Id: I2a7fe904c4d72a88fa0db1f3d9e55753f8f5aa01

commit | commitdiff | tree

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

[automerger skipped] [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
am: 633bf7e310 -s ours
am skip reason: subject contains skip directive

Change-Id: I4cf14b1e4d53a53e553dfa31afc0a11b2e31dee1

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:26:23 +0000 (15:26 -0700)]

[automerger skipped] DO NOT MERGE Drop Bluetooth connection with weak encryption key
am: e32d4aa7a4 -s ours
am skip reason: subject contains skip directive

Change-Id: Ica0e4d762e9b9e50847c0403a1fd70724f9be020

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

Jack He [Thu, 21 Mar 2019 00:51:09 +0000 (17:51 -0700)]

DO NOT MERGE Log encryption key size

* Log result from HCI_READ_ENCR_KEY_SIZE command

Bug: 124301137
Test: test drive with statsd
Change-Id: I776a3c357fcd75623fba241f150d1afb58aa23fb

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

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

Martin Brabham [Mon, 25 Feb 2019 22:40:33 +0000 (14:40 -0800)]

[DO NOT MERGE] btif/osi: move I/O to OSI layer. disable for multi-user.

Two issues here.
One, read/write/modify/remove access to the checksum by the secondary user.
Two, Fail to access keystore with secondary user stack running (stack doesn't run as UID 1002)

Bug: 117993149
Test: atest net_test_btif net_test_bluetooth net_test_osi
Change-Id: I7af452e00a4f342f1c49006e86488b59195b70ce
Merged-In: I7af452e00a4f342f1c49006e86488b59195b70ce

commit | commitdiff | tree

Martin Brabham [Tue, 12 Feb 2019 19:23:39 +0000 (11:23 -0800)]

[DO NOT MERGE] Handle edge cases where input or hash/data could be null.

Bug: b/117993149
Test: Manual; atest net_test_btif net_test_bluetooth
Change-Id: Ia91ea822ee2147b2a2d14bea250a708e8c10bae4
Merged-In: Ia91ea822ee2147b2a2d14bea250a708e8c10bae4

commit | commitdiff | tree

Greg Kaiser [Thu, 7 Feb 2019 16:40:11 +0000 (08:40 -0800)]

[DO NOT MERGE] btif: Avoid resource leak in error case

If our memory allocation fails, we make sure we close our file
before returning.

Bug: b/117993149
Test: TreeHugger
Change-Id: I43b43d8b3d96e51a73bc8187ef614d02bbd31781
Merged-In: I43b43d8b3d96e51a73bc8187ef614d02bbd31781

commit | commitdiff | tree

Greg Kaiser [Thu, 7 Feb 2019 16:48:20 +0000 (08:48 -0800)]

[DO NOT MERGE] btif: Avoid a couple string copies

We pass a couple string arguments by const reference instead of
by copy.

Bug: b/117993149
Test: TreeHugger
Change-Id: I01e476edf1f5e8c7b6fc88e0eb87ed3bbfca7a00
Merged-In: I01e476edf1f5e8c7b6fc88e0eb87ed3bbfca7a00

commit | commitdiff | tree

Greg Kaiser [Thu, 7 Feb 2019 16:54:01 +0000 (08:54 -0800)]

[DO NOT MERGE] btif: Lighter weight file existence check

We switch from the heavier weight fopen() to using access() to
check for file existence and readability. This avoids some of
the file opening overhead we don't need here.

Bug: b/117993149
Test: TreeHugger
Change-Id: Ib47b24e9d96803b7822535f9f566aa7818b38953
Merged-In: Ib47b24e9d96803b7822535f9f566aa7818b38953

commit | commitdiff | tree

Martin Brabham [Fri, 1 Feb 2019 21:42:58 +0000 (13:42 -0800)]

[DO NOT MERGE] Implement key attestation using AndroidKeystore.

Store SHA256 hash of the config file in an encrypted file that has been encrypted using the Android Keystore API.

Bug: b/117993149
Test: Manual
Change-Id: I26de9ea05f515d6643a83d11628490fb49e10743
Merged-In: I26de9ea05f515d6643a83d11628490fb49e10743

commit | commitdiff | tree

TreeHugger Robot [Sat, 9 Mar 2019 03:09:41 +0000 (03:09 +0000)]

Merge "DO NOT MERGE: Use a weak pointer to deliver updates to AVRCP devices." into pi-dev

commit | commitdiff | tree

Ajay Panicker [Fri, 14 Dec 2018 22:55:02 +0000 (14:55 -0800)]

DO NOT MERGE: Use a weak pointer to deliver updates to AVRCP devices.

If a device disconnects right before a update message gets queued, the
device becomes null and there is a crash when the callback for the
update executes on the disconnected device. This patch switches the
device reference from being Unretained to using a weak pointer so that
the callback just doesn't execute if the device is disconnected.

Bug: 120431125
Bug: 120445479
Test: Use the same test as b/120477414 as that bug causes a disconnect
at the same time as a media update.

Change-Id: I1dcc08e5c9866106e7ec0dad52505e34b42da600

commit | commitdiff | tree

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

[automerger skipped] [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
am: aa03b49791 -s ours
am skip reason: subject contains skip directive

Change-Id: I640047c7412d16eb5e48e15027eec92aeea13f5e

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

Jakub Pawlowski [Tue, 5 Mar 2019 11:10:02 +0000 (12:10 +0100)]

Clear the link key when releasing security records

Test: compilation
Bug: 127479372
Change-Id: Ia571a2048fa5ca85c45b03b39d398e480aadb55a
Merged-In: Ia571a2048fa5ca85c45b03b39d398e480aadb55a
(cherry picked from commit acb0a7eb17ec327b46071bc482c8b9687b730fdc)

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

TreeHugger Robot [Sat, 23 Feb 2019 07:30:06 +0000 (07:30 +0000)]

Merge "Fix mtu assignment with correct value" into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 22 Feb 2019 05:04:53 +0000 (05:04 +0000)]

Merge "Do not close dump file descriptor" into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 21 Feb 2019 23:44:19 +0000 (23:44 +0000)]

Merge "Fix for Bluetooth device name is resetting to default name after reboot" into pi-dev

commit | commitdiff | tree

Ugo Yu [Fri, 8 Feb 2019 20:42:30 +0000 (12:42 -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: 8500500386 -s ours
am skip reason: subject contains skip directive

Change-Id: I4f30022298edd7521c895bdceb743662e915b229

commit | commitdiff | tree

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

[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 0989441858 -s ours am: a6d6406255 -s ours
am: feeb53795a -s ours
am skip reason: subject contains skip directive

Change-Id: Ie86e28c3ee0c779e9f4df6a1279750e67765eec9

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:14:17 +0000 (00:14 -0800)]

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

Change-Id: I80a5aea488949c646baf1e7f514878ec1cba38e3

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

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

Hansong Zhang [Fri, 8 Feb 2019 00:50:16 +0000 (16:50 -0800)]

Merge "btm_proc_smp_cback: Don't access p_dev_rec if freed" into oc-dev am: 4ac889b785 am: c87e949d53
am: d59c9ec72e

Change-Id: I31957dc7e323364de3529b3375835dd4cb7a501d

commit | commitdiff | tree

Hansong Zhang [Fri, 8 Feb 2019 00:46:11 +0000 (16:46 -0800)]

Merge "btm_proc_smp_cback: Don't access p_dev_rec if freed" into oc-dev am: 4ac889b785
am: c87e949d53

Change-Id: I6875480db5a714d721d20ead2111627f4ab5a68e

commit | commitdiff | tree

Ugo Yu [Fri, 8 Feb 2019 00:44:52 +0000 (16:44 -0800)]

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev
am: c48874b71b -s ours
am skip reason: subject contains skip directive

Change-Id: Ibcaf4a7d743ec0cfeebb8aecc7bab2bf3b88615d

commit | commitdiff | tree

Ugo Yu [Fri, 8 Feb 2019 00:44:14 +0000 (16:44 -0800)]

[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2)
am: f3681c8616 -s ours
am skip reason: subject contains skip directive

Change-Id: I6a7d8107caa959212e0d93e708dd87851199a2c8

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 8 Feb 2019 00:27:55 +0000 (00:27 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 7 Feb 2019 23:42:23 +0000 (23:42 +0000)]

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

commit | commitdiff | tree

Hansong Zhang [Thu, 7 Feb 2019 21:25:32 +0000 (13:25 -0800)]

Merge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into oc-dev am: e145805974 am: 9b0e9a32bb
am: 53e961c220

Change-Id: I9fc3a00e1b38236aaa1016ef0c422fe5303f407b

commit | commitdiff | tree

Hansong Zhang [Thu, 7 Feb 2019 21:21:26 +0000 (13:21 -0800)]

Merge changes from topic "am-5380790e-42fb-4784-96c0-4412e4fdccd0" into oc-dev am: e145805974
am: 9b0e9a32bb

Change-Id: I02f1344805f748024dc28e05fd0afe67a6afb61a

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Hansong Zhang [Sat, 2 Feb 2019 08:13:14 +0000 (00:13 -0800)]

Merge changes from topic "am-cdd47550-8877-443a-826f-db2b25d750ce" into oc-dev am: 8ea254e227 am: 04f9bde9ea
am: a99a5f342a

Change-Id: I84c36724790660df845bb3a5ade56f792601ca0d

system/bt

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.