OSDN Git Service
The Android Open Source Project [Mon, 10 Jun 2019 20:30:04 +0000 (13:30 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master am:
5cf6a28c88 -s ours am:
f2402e7b26 -s ours
am:
577f29b3ba
Change-Id: I5958b12b95aa3023ae435f21ca8cc67d447eb26b
The Android Open Source Project [Mon, 10 Jun 2019 20:17:46 +0000 (13:17 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master am:
5cf6a28c88 -s ours
am:
f2402e7b26 -s ours
am skip reason: subject contains skip directive
Change-Id: Ibd8e4005bda46357ede597929f3d324d3cb95378
The Android Open Source Project [Mon, 10 Jun 2019 20:06:10 +0000 (13:06 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master
am:
5cf6a28c88 -s ours
am skip reason: subject contains skip directive
Change-Id: I415dbf27f8455439578babd75e4420522a3ba1a1
The Android Open Source Project [Mon, 10 Jun 2019 16:32:28 +0000 (09:32 -0700)]
DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master
Bug:
134605042
Change-Id: Icf8a142122c66c40c9e906380778d1d0237ba4be
Android Build Merger (Role) [Sat, 8 Jun 2019 05:06:26 +0000 (05:06 +0000)]
Merge "Confirm the presence of BT key when BT ON am:
bd8c5865c9 am:
9b1e7741d1" into qt-r1-dev-plus-aosp
Martin Brabham [Sat, 8 Jun 2019 05:06:14 +0000 (22:06 -0700)]
Confirm the presence of BT key when BT ON am:
bd8c5865c9
am:
fac802a491
Change-Id: I83c2564406b0300d1f7d009a9ab010e70d6fd6d6
Martin Brabham [Sat, 8 Jun 2019 05:06:14 +0000 (22:06 -0700)]
Confirm the presence of BT key when BT ON am:
bd8c5865c9
am:
9b1e7741d1
Change-Id: I0a30ebaa6a1cbb7390198a3650003e7366597a38
Martin Brabham [Sat, 8 Jun 2019 05:01:14 +0000 (22:01 -0700)]
Confirm the presence of BT key when BT ON
am:
bd8c5865c9
Change-Id: I2ea7afb95bcb4f72f95688858cdb32e7d262c572
Martin Brabham [Sat, 8 Jun 2019 05:01:14 +0000 (22:01 -0700)]
Confirm the presence of BT key when BT ON
am:
bd8c5865c9
Change-Id: If3b988395c9b09d4b8809edb944a5d5830a3821c
Martin Brabham [Fri, 31 May 2019 19:53:07 +0000 (12:53 -0700)]
Confirm the presence of BT key when BT ON
After clearing Bluetooth data, the Bluetooth key will be cleared in the
same time. When turn on Bluetooth, NE happened at the step of checking
Bluetooth key.
Bug:
133214365
Test: ahost --host test net_test_bluetooth
Change-Id: I88f5dfae07352a794b304da60e09253c004fb3d4
Android Build Merger (Role) [Fri, 7 Jun 2019 10:33:44 +0000 (10:33 +0000)]
Merge "[automerger skipped] Merge changes from topic "am-
e3f94184-0df3-403b-b2dc-
4ebd50beee32" into oc-dev am:
38535adcd0 -s ours am:
28a8e8b848 -s ours am:
c5837d3d81 -s ours am:
5b7daae369 -s ours am:
4ea1ac1105 -s ours am:
97a5d6002b -s ours am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
461f0b4739 is in history" into qt-r1-dev-plus-aosp
Jakub Pawlowski [Fri, 7 Jun 2019 10:33:35 +0000 (03:33 -0700)]
[automerger skipped] Merge changes from topic "am-
e3f94184-0df3-403b-b2dc-
4ebd50beee32" into oc-dev am:
38535adcd0 -s ours am:
28a8e8b848 -s ours am:
c5837d3d81 -s ours am:
5b7daae369 -s ours am:
4ea1ac1105 -s ours
am:
e0692dcd5e -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
461f0b4739 is in history
Change-Id: I25e4b888c90d4d07845a860dccf33f55e1c98da3
Jakub Pawlowski [Fri, 7 Jun 2019 10:33:35 +0000 (03:33 -0700)]
[automerger skipped] Merge changes from topic "am-
e3f94184-0df3-403b-b2dc-
4ebd50beee32" into oc-dev am:
38535adcd0 -s ours am:
28a8e8b848 -s ours am:
c5837d3d81 -s ours am:
5b7daae369 -s ours am:
4ea1ac1105 -s ours
am:
97a5d6002b -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
461f0b4739 is in history
Change-Id: I2b22d9dd222303e9b63e6a0301d318f655e4a984
Android Build Merger (Role) [Fri, 7 Jun 2019 10:33:25 +0000 (10:33 +0000)]
Merge "[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
461f0b4739 -s ours am:
35f2cb15f1 -s ours am:
75384547fb -s ours am:
dd59bd4400 -s ours am:
82398ca371 -s ours am:
811fb56551 -s ours am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
c887dd6ed1 is in history" into qt-r1-dev-plus-aosp
Jakub Pawlowski [Fri, 7 Jun 2019 10:33:14 +0000 (03:33 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
461f0b4739 -s ours am:
35f2cb15f1 -s ours am:
75384547fb -s ours am:
dd59bd4400 -s ours am:
82398ca371 -s ours
am:
01d7784be5 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
c887dd6ed1 is in history
Change-Id: I0d9c412a87849fb04acc46993da4567c2bd68843
Jakub Pawlowski [Fri, 7 Jun 2019 10:33:14 +0000 (03:33 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
461f0b4739 -s ours am:
35f2cb15f1 -s ours am:
75384547fb -s ours am:
dd59bd4400 -s ours am:
82398ca371 -s ours
am:
811fb56551 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
c887dd6ed1 is in history
Change-Id: Ib41c84e1c230f7c51d5855e131203e4c72b3ff8a
Jakub Pawlowski [Fri, 7 Jun 2019 10:28:35 +0000 (03:28 -0700)]
[automerger skipped] Merge changes from topic "am-
e3f94184-0df3-403b-b2dc-
4ebd50beee32" into oc-dev am:
38535adcd0 -s ours am:
28a8e8b848 -s ours am:
c5837d3d81 -s ours am:
5b7daae369 -s ours
am:
4ea1ac1105 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
461f0b4739 is in history
Change-Id: I6b49af11ced9165f58df9237771f6d739128500c
Jakub Pawlowski [Fri, 7 Jun 2019 10:28:34 +0000 (03:28 -0700)]
[automerger skipped] Merge changes from topic "am-
e3f94184-0df3-403b-b2dc-
4ebd50beee32" into oc-dev am:
38535adcd0 -s ours am:
28a8e8b848 -s ours am:
c5837d3d81 -s ours am:
5b7daae369 -s ours
am:
4ea1ac1105 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
461f0b4739 is in history
Change-Id: I71b353a5efbc64b10ff787c98157107e30b9b4c0
Jakub Pawlowski [Fri, 7 Jun 2019 10:28:13 +0000 (03:28 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
461f0b4739 -s ours am:
35f2cb15f1 -s ours am:
75384547fb -s ours am:
dd59bd4400 -s ours
am:
82398ca371 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
c887dd6ed1 is in history
Change-Id: I52a7a78da40b378f0b20112f759830f75c834813
Jakub Pawlowski [Fri, 7 Jun 2019 10:28:12 +0000 (03:28 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
461f0b4739 -s ours am:
35f2cb15f1 -s ours am:
75384547fb -s ours am:
dd59bd4400 -s ours
am:
82398ca371 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
c887dd6ed1 is in history
Change-Id: I86db4f91775e9bb362643a0145e900fd9a82ab5e
Jakub Pawlowski [Fri, 7 Jun 2019 10:23:30 +0000 (03:23 -0700)]
[automerger skipped] Merge changes from topic "am-
e3f94184-0df3-403b-b2dc-
4ebd50beee32" into oc-dev am:
38535adcd0 -s ours am:
28a8e8b848 -s ours am:
c5837d3d81 -s ours
am:
5b7daae369 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
461f0b4739 is in history
Change-Id: I1dba0b8ab2cdb0363f6a53939385d2d6a45d18f7
Jakub Pawlowski [Fri, 7 Jun 2019 10:23:04 +0000 (03:23 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
461f0b4739 -s ours am:
35f2cb15f1 -s ours am:
75384547fb -s ours
am:
dd59bd4400 -s ours
am skip reason: subject contains skip directive
Change-Id: Ifbda31c8076491dcf7c583ae6b7a12cf4c82a4f0
Jakub Pawlowski [Fri, 7 Jun 2019 10:18:27 +0000 (03:18 -0700)]
[automerger skipped] Merge changes from topic "am-
e3f94184-0df3-403b-b2dc-
4ebd50beee32" into oc-dev am:
38535adcd0 -s ours am:
28a8e8b848 -s ours
am:
c5837d3d81 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
461f0b4739 is in history
Change-Id: Ia742ff3db6e10ecdcfae893a44ed3e766c40cbe6
Jakub Pawlowski [Fri, 7 Jun 2019 10:18:03 +0000 (03:18 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
461f0b4739 -s ours am:
35f2cb15f1 -s ours
am:
75384547fb -s ours
am skip reason: subject contains skip directive
Change-Id: I952f4abe93c3f75e9de141727606886ed234b8ad
Jakub Pawlowski [Fri, 7 Jun 2019 10:12:23 +0000 (03:12 -0700)]
[automerger skipped] Merge changes from topic "am-
e3f94184-0df3-403b-b2dc-
4ebd50beee32" into oc-dev am:
38535adcd0 -s ours
am:
28a8e8b848 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
461f0b4739 is in history
Change-Id: I128d6b1fbeccea202ddaaa73e4a1c9032afdfda1
Jakub Pawlowski [Fri, 7 Jun 2019 10:12:08 +0000 (03:12 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
461f0b4739 -s ours
am:
35f2cb15f1 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
bdac7b911f is in history
Change-Id: Idd9e3a1ffa28ca0de51f37b043c452b0cde9fcfe
Jakub Pawlowski [Fri, 7 Jun 2019 10:08:32 +0000 (03:08 -0700)]
[automerger skipped] Merge changes from topic "am-
e3f94184-0df3-403b-b2dc-
4ebd50beee32" into oc-dev
am:
38535adcd0 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
461f0b4739 is in history
Change-Id: I14e6e0212fd40a7a74cc9f4672cd8ce611763761
Jakub Pawlowski [Fri, 7 Jun 2019 10:08:09 +0000 (03:08 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
am:
461f0b4739 -s ours
am skip reason: SHA1
461f0b4739 skipped by user jpawlowski
Change-Id: If029a012222cb9a45a593282524518f30f9f0dc6
Xin Li [Fri, 7 Jun 2019 07:35:26 +0000 (00:35 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master" into stage-aosp-master am:
9b39d9698a -s ours
am:
67b0d69371
Change-Id: I2a94c6c0a2bf6a9551d5fa1f028e3054b90c471d
Xin Li [Fri, 7 Jun 2019 07:28:10 +0000 (00:28 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master" into stage-aosp-master
am:
9b39d9698a -s ours
am skip reason: subject contains skip directive
Change-Id: I89da2ee16fdd9cc9d081fc762e816573f866449a
Xin Li [Fri, 7 Jun 2019 07:26:32 +0000 (00:26 -0700)]
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master am:
11c90c6751 -s ours
am:
d1788a8ba0
Change-Id: I30c3afa353fe20b4c74bf455f8571cf56831afd9
Xin Li [Fri, 7 Jun 2019 07:16:26 +0000 (00:16 -0700)]
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master
am:
11c90c6751 -s ours
am skip reason: subject contains skip directive
Change-Id: I8438b91376b5ec5bc320beb7f51c3e66e8d51ba3
TreeHugger Robot [Fri, 7 Jun 2019 07:06:20 +0000 (07:06 +0000)]
Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master" into stage-aosp-master
Xin Li [Wed, 5 Jun 2019 22:41:48 +0000 (15:41 -0700)]
DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master
Bug:
134605042
Change-Id: I5be87422d75fb89d35135a5e087920fae1f6b2d6
Jakub Pawlowski [Thu, 6 Jun 2019 19:47:12 +0000 (19:47 +0000)]
Merge changes from topic "am-
e3f94184-0df3-403b-b2dc-
4ebd50beee32" into oc-dev
* changes:
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf am:
0a76ef0245 am:
20649305ba am:
20f1cf2b81 skipped:
cb880ad379
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf am:
0a76ef0245 am:
20649305ba am:
20f1cf2b81
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf am:
0a76ef0245 am:
20649305ba
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf am:
0a76ef0245
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf
DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
Jakub Pawlowski [Thu, 6 Jun 2019 19:11:31 +0000 (12:11 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
bdac7b911f -s ours am:
35f034bb61 -s ours am:
04d073cb2d -s ours
am:
3ad01f14d2 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
c978f86b50 is in history
Change-Id: I7d0802c3bddac235c4b6c074063f13e8340ac4cc
Jakub Pawlowski [Thu, 6 Jun 2019 19:11:12 +0000 (12:11 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c978f86b50 -s ours am:
332964b0ad -s ours
am:
7462717e0e -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
c978f86b50 is in history
Change-Id: Ie194063a72e27ce0e138fc4002669121e4726ed5
Jakub Pawlowski [Thu, 6 Jun 2019 19:10:20 +0000 (12:10 -0700)]
Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c887dd6ed1
am:
49d1907d67
Change-Id: I016d2448296e436c2c5399c682f9b675e1102329
Jakub Pawlowski [Thu, 6 Jun 2019 19:05:03 +0000 (12:05 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
bdac7b911f -s ours am:
35f034bb61 -s ours am:
04d073cb2d -s ours
am:
29317a0da0 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
c978f86b50 is in history
Change-Id: I38539cb0d2cd0c24c9bea223a116135867da7a8e
Jakub Pawlowski [Thu, 6 Jun 2019 19:04:39 +0000 (12:04 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c978f86b50 -s ours am:
332964b0ad -s ours
am:
2791135f4f -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
c887dd6ed1 is in history
Change-Id: Iee9d40f7b2e58bbbdbf511e822dfa9afc464d99f
Jakub Pawlowski [Thu, 6 Jun 2019 19:04:16 +0000 (12:04 -0700)]
Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c887dd6ed1
am:
8377e16f88
Change-Id: Ia397bf0ffc3adf4f301da68cae0928c9b2cbdd47
Jakub Pawlowski [Thu, 6 Jun 2019 19:02:17 +0000 (12:02 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
bdac7b911f -s ours am:
35f034bb61 -s ours
am:
04d073cb2d -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
c978f86b50 is in history
Change-Id: I3b83079687a96a764a6879e2acd7e730741b531c
Jakub Pawlowski [Thu, 6 Jun 2019 19:01:56 +0000 (12:01 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c978f86b50 -s ours
am:
332964b0ad -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
c887dd6ed1 is in history
Change-Id: I2749b277c011f2d9d10f3a54a6729690ac2795f5
Jakub Pawlowski [Thu, 6 Jun 2019 19:01:55 +0000 (12:01 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
bdac7b911f -s ours am:
35f034bb61 -s ours
am:
04d073cb2d -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
c978f86b50 is in history
Change-Id: I15822e529aac0cb7c92f105680bd4f92e80803a5
Jakub Pawlowski [Thu, 6 Jun 2019 19:01:36 +0000 (12:01 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c978f86b50 -s ours
am:
332964b0ad -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1
c887dd6ed1 is in history
Change-Id: I793f3ff6b902aaedf590ea9c3c7f7060cbf5b8e9
Jakub Pawlowski [Thu, 6 Jun 2019 19:01:13 +0000 (12:01 -0700)]
Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
am:
c887dd6ed1
Change-Id: I391cfa47c88580d6a18510f2186d8560d023287e
Jakub Pawlowski [Thu, 6 Jun 2019 18:56:16 +0000 (11:56 -0700)]
Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
am:
c887dd6ed1
Change-Id: Idbde20caeaaa39c1ab256b11cc6a984f5d441132
Jakub Pawlowski [Thu, 6 Jun 2019 18:56:11 +0000 (11:56 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
bdac7b911f -s ours
am:
35f034bb61 -s ours
am skip reason: subject contains skip directive
Change-Id: Icfbb46e23894cdf4baf3ded483a169ab5ea225ff
Jakub Pawlowski [Thu, 6 Jun 2019 18:55:49 +0000 (11:55 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
am:
c978f86b50 -s ours
am skip reason: subject contains skip directive
Change-Id: I3bed57af388e87495b43a36ae51b3460a0829e99
Jakub Pawlowski [Thu, 6 Jun 2019 18:54:46 +0000 (11:54 -0700)]
[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
am:
bdac7b911f -s ours
am skip reason: subject contains skip directive
Change-Id: Ibddb04bcbe2ff0c0197071492e58abee2037d7dc
Android Build Merger (Role) [Thu, 6 Jun 2019 14:32:33 +0000 (14:32 +0000)]
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf am:
0a76ef0245 am:
20649305ba am:
20f1cf2b81 skipped:
cb880ad379
Change-Id: I0ce92d6832d71961c2774d523ccaff25aae6ee75
Android Build Merger (Role) [Thu, 6 Jun 2019 14:32:29 +0000 (14:32 +0000)]
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf am:
0a76ef0245 am:
20649305ba am:
20f1cf2b81
Change-Id: I462281e1e328875bff50defc951aa436245740da
Android Build Merger (Role) [Thu, 6 Jun 2019 14:32:26 +0000 (14:32 +0000)]
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf am:
0a76ef0245 am:
20649305ba
Change-Id: Idcdaee2b8091c775df14722a28b56589957833f2
Android Build Merger (Role) [Thu, 6 Jun 2019 14:32:23 +0000 (14:32 +0000)]
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf am:
0a76ef0245
Change-Id: I570033782572166e69cd1edd65260c499473a661
Android Build Merger (Role) [Thu, 6 Jun 2019 14:32:19 +0000 (14:32 +0000)]
[automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am:
c5aa5feebf
Change-Id: Id7ceb1b67894931e9c0ce188dff19177afd4a7ee
Jakub Pawlowski [Thu, 6 Jun 2019 11:54:55 +0000 (13:54 +0200)]
DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
If remote device stop the encryption before we call "Read Encryption Key Size",
we might receive Insufficient Security, which means that link is no longer
encrypted.
In such cases we should stay connected, rather than disconnecting the
link.
Test: Connect to device that stop encryption right after encryption is
complete, i.e. to change roles.
Bug:
124301137
Bug:
132626699
Change-Id: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Merged-In: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Jakub Pawlowski [Thu, 6 Jun 2019 11:54:55 +0000 (13:54 +0200)]
DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
If remote device stop the encryption before we call "Read Encryption Key Size",
we might receive Insufficient Security, which means that link is no longer
encrypted.
In such cases we should stay connected, rather than disconnecting the
link.
Test: Connect to device that stop encryption right after encryption is
complete, i.e. to change roles.
Bug:
124301137
Bug:
132626699
Change-Id: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Merged-In: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Jakub Pawlowski [Thu, 6 Jun 2019 11:54:55 +0000 (13:54 +0200)]
DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
If remote device stop the encryption before we call "Read Encryption Key Size",
we might receive Insufficient Security, which means that link is no longer
encrypted.
In such cases we should stay connected, rather than disconnecting the
link.
Test: Connect to device that stop encryption right after encryption is
complete, i.e. to change roles.
Bug:
124301137
Bug:
132626699
Change-Id: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Merged-In: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Jakub Pawlowski [Thu, 6 Jun 2019 11:54:55 +0000 (13:54 +0200)]
DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
If remote device stop the encryption before we call "Read Encryption Key Size",
we might receive Insufficient Security, which means that link is no longer
encrypted.
In such cases we should stay connected, rather than disconnecting the
link.
Test: Connect to device that stop encryption right after encryption is
complete, i.e. to change roles.
Bug:
124301137
Bug:
132626699
Change-Id: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Merged-In: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Jakub Pawlowski [Thu, 6 Jun 2019 11:54:55 +0000 (13:54 +0200)]
Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size
If remote device stop the encryption before we call "Read Encryption Key Size",
we might receive Insufficient Security, which means that link is no longer
encrypted.
In such cases we should stay connected, rather than disconnecting the
link.
Test: Connect to device that stop encryption right after encryption is
complete, i.e. to change roles.
Bug:
124301137
Bug:
132626699
Change-Id: Iab0fd9f357d18a6b048b971d0393fbb47fd4d793
Myles Watson [Thu, 6 Jun 2019 00:08:16 +0000 (17:08 -0700)]
Merge "OS: Create Alarms on a Handler's thread" am:
e1c1b2d8f6 am:
0cd3a70bce
am:
8d065c0fab
Change-Id: Icb7a2ce4541e83a9bf96a13929e7e0541a39b1a5
Myles Watson [Wed, 5 Jun 2019 23:58:02 +0000 (16:58 -0700)]
Merge "OS: Create Alarms on a Handler's thread" am:
e1c1b2d8f6
am:
0cd3a70bce
Change-Id: I8fd5f527037428ce79d2a3068d9393a939c5f79d
Myles Watson [Wed, 5 Jun 2019 23:41:55 +0000 (16:41 -0700)]
Merge "OS: Create Alarms on a Handler's thread"
am:
e1c1b2d8f6
Change-Id: Ie4238a454195704381a14337cf6c62ba340569f4
Treehugger Robot [Wed, 5 Jun 2019 23:15:28 +0000 (23:15 +0000)]
Merge "OS: Create Alarms on a Handler's thread"
Myles Watson [Mon, 3 Jun 2019 16:25:28 +0000 (09:25 -0700)]
OS: Create Alarms on a Handler's thread
Test: bluetooth_test_gd --gtest_filter=*Alarm*
Change-Id: I017a5f74f1d72468ca487536c88a0cf3eb48ddea
Ugo Yu [Wed, 5 Jun 2019 20:17:00 +0000 (13:17 -0700)]
[automerger skipped] Rename and reset the proirity of HID host thread am:
eb2a389a9e -s ours
am:
302d8f2ba5 -s ours
am skip reason: change_id Ibd983e96bc339393842d4c2e2aa226534095e225 with SHA1
4e25ef13b2 is in history
Change-Id: I761458e7a618c1482a5cff68296927838118559d
Ugo Yu [Wed, 5 Jun 2019 20:15:52 +0000 (13:15 -0700)]
[automerger skipped] Rename and reset the proirity of HID host thread am:
eb2a389a9e
am:
00b7171710 -s ours
am skip reason: change_id Ibd983e96bc339393842d4c2e2aa226534095e225 with SHA1
4e25ef13b2 is in history
Change-Id: I076974ce8aeb6ee4b7e050544f92d8e06df9805f
Ugo Yu [Wed, 5 Jun 2019 19:58:58 +0000 (12:58 -0700)]
[automerger skipped] Rename and reset the proirity of HID host thread
am:
eb2a389a9e -s ours
am skip reason: change_id Ibd983e96bc339393842d4c2e2aa226534095e225 with SHA1
4e25ef13b2 is in history
Change-Id: If40ad0ad1e12686a38caabbe09446fbe4466956e
Ugo Yu [Wed, 5 Jun 2019 19:56:04 +0000 (12:56 -0700)]
Rename and reset the proirity of HID host thread
am:
eb2a389a9e
Change-Id: Id5519e905054ab98f8c37537e9c4dc522cad4680
Ugo Yu [Wed, 5 Jun 2019 17:42:21 +0000 (10:42 -0700)]
Rename and reset the proirity of HID host thread am:
4e25ef13b2 am:
76e26cffbb
am:
c5ac6f25ec
Change-Id: I73bee7143dfcb1c369863b5685e2c0e3dacad33d
Ugo Yu [Wed, 5 Jun 2019 17:35:19 +0000 (10:35 -0700)]
Rename and reset the proirity of HID host thread am:
4e25ef13b2
am:
76e26cffbb
Change-Id: I0dccf0d64ce506a61f11fe411b27f9b2cc339d9d
Ugo Yu [Wed, 5 Jun 2019 17:30:25 +0000 (10:30 -0700)]
Rename and reset the proirity of HID host thread
am:
4e25ef13b2
Change-Id: If957c7e793d4ae2462d9b1c5a57e17a91224d02a
Ugo Yu [Wed, 5 Jun 2019 12:08:29 +0000 (20:08 +0800)]
Rename and reset the proirity of HID host thread
* Rename the HH event polling thread to bt_hh_thread
* HH event polling thread is created by bt_main_thread
with RT priority. Lower the thread priority since the
tasks in this thread is not timing critical
Bug:
131787936
Test: Connect to a HID device
Run "adb shell ps -A -T -Z -O rtprio"
Change-Id: Ibd983e96bc339393842d4c2e2aa226534095e225
Merged-In: Ibd983e96bc339393842d4c2e2aa226534095e225
Ugo Yu [Wed, 5 Jun 2019 12:08:29 +0000 (20:08 +0800)]
Rename and reset the proirity of HID host thread
* Rename the HH event polling thread to bt_hh_thread
* HH event polling thread is created by bt_main_thread
with RT priority. Lower the thread priority since the
tasks in this thread is not timing critical
Bug:
131787936
Test: Connect to a HID device
Run "adb shell ps -A -T -Z -O rtprio"
Change-Id: Ibd983e96bc339393842d4c2e2aa226534095e225
Android Build Merger (Role) [Wed, 5 Jun 2019 08:15:14 +0000 (08:15 +0000)]
Merge changes from topic "am-
08095d00f91c4ba9abace74f509b5eef" into qt-r1-dev-plus-aosp
* changes:
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am:
b751ea3a90 am:
2b3330a139 -s ours am:
d9997755f9 -s ours am:
0f3b13b40e -s ours am:
a2185db6d3 -s ours am:
2689c11a34 -s ours am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
5240e71881 am:
5f8f0c8b74 -s ours am:
1d7523417e -s ours am:
1c2cf08476 -s ours am:
28c62892b6 -s ours am:
3f089c6485 -s ours am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history
Android Build Merger (Role) [Wed, 5 Jun 2019 08:14:57 +0000 (08:14 +0000)]
Merge changes from topic "am-
0915014a8cdb427da197d6f5e948985b" into qt-r1-dev-plus-aosp
* changes:
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am:
b751ea3a90 am:
2b3330a139 -s ours am:
d9997755f9 -s ours am:
0f3b13b40e -s ours am:
a2185db6d3 -s ours am:
2e43c1a7b7 -s ours am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
5240e71881 am:
5f8f0c8b74 -s ours am:
1d7523417e -s ours am:
1c2cf08476 -s ours am:
28c62892b6 -s ours am:
7ddbcb0da0 -s ours am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history
Ugo Yu [Wed, 5 Jun 2019 08:14:45 +0000 (01:14 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am:
b751ea3a90 am:
2b3330a139 -s ours am:
d9997755f9 -s ours am:
0f3b13b40e -s ours am:
a2185db6d3 -s ours
am:
2689c11a34 -s ours
am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history
Change-Id: Id68c9eaffca892fa995fa723bf2232e71d5ff97f
Ugo Yu [Wed, 5 Jun 2019 08:14:32 +0000 (01:14 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am:
b751ea3a90 am:
2b3330a139 -s ours am:
d9997755f9 -s ours am:
0f3b13b40e -s ours am:
a2185db6d3 -s ours
am:
2e43c1a7b7 -s ours
am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history
Change-Id: I57fb836c10df8171dda85c1c64b8ae554c5a6dc2
Ugo Yu [Wed, 5 Jun 2019 08:14:32 +0000 (01:14 -0700)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
5240e71881 am:
5f8f0c8b74 -s ours am:
1d7523417e -s ours am:
1c2cf08476 -s ours am:
28c62892b6 -s ours
am:
3f089c6485 -s ours
am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history
Change-Id: I7b781f525d9fd99f7c3d14d68f41b8db03a1c976
Ugo Yu [Wed, 5 Jun 2019 08:14:25 +0000 (01:14 -0700)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
5240e71881 am:
5f8f0c8b74 -s ours am:
1d7523417e -s ours am:
1c2cf08476 -s ours am:
28c62892b6 -s ours
am:
7ddbcb0da0 -s ours
am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history
Change-Id: I5a501faa4dcaf831d6df3c53bf4e3f8facdd1aff
Jakub Pawlowski [Wed, 5 Jun 2019 08:14:16 +0000 (01:14 -0700)]
Merge "Hearing Aid: properly track audio Suspend/Resume" into qt-dev am:
24e8293439
am:
f37a1ecd38
Change-Id: I0d1ba9d11158e18609d96f219e23787ba4f32205
Jakub Pawlowski [Wed, 5 Jun 2019 08:12:11 +0000 (01:12 -0700)]
Merge "Hearing Aid: properly track audio Suspend/Resume" into qt-dev am:
24e8293439
am:
08f3b7ca8b
Change-Id: I919a0c12f599254f2349d455b7cfa0e09b02dfa3
Ugo Yu [Wed, 5 Jun 2019 04:09:42 +0000 (21:09 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am:
b751ea3a90 am:
2b3330a139 -s ours am:
d9997755f9 -s ours am:
0f3b13b40e -s ours
am:
a2185db6d3 -s ours
am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history
Change-Id: I3eec2a4f9bf59500f160eab2aa673f434f7b551b
Ugo Yu [Wed, 5 Jun 2019 04:09:41 +0000 (21:09 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am:
b751ea3a90 am:
2b3330a139 -s ours am:
d9997755f9 -s ours am:
0f3b13b40e -s ours
am:
a2185db6d3 -s ours
am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history
Change-Id: Idc71ae33d1290847f33c1f040dabe79bcaa5f767
Ugo Yu [Wed, 5 Jun 2019 04:09:29 +0000 (21:09 -0700)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
5240e71881 am:
5f8f0c8b74 -s ours am:
1d7523417e -s ours am:
1c2cf08476 -s ours
am:
28c62892b6 -s ours
am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history
Change-Id: I187533195bf8dadbbe002259b03679349f10954f
Ugo Yu [Wed, 5 Jun 2019 04:09:29 +0000 (21:09 -0700)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
5240e71881 am:
5f8f0c8b74 -s ours am:
1d7523417e -s ours am:
1c2cf08476 -s ours
am:
28c62892b6 -s ours
am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history
Change-Id: Iebb4af47eb8651bdb6c3192743c710e02668b070
Jakub Pawlowski [Wed, 5 Jun 2019 04:09:07 +0000 (21:09 -0700)]
Merge "Hearing Aid: properly track audio Suspend/Resume" into qt-dev
am:
24e8293439
Change-Id: I93aca174d8272b3ff8f39dacf194584f38002ba5
Jakub Pawlowski [Wed, 5 Jun 2019 04:09:07 +0000 (21:09 -0700)]
Merge "Hearing Aid: properly track audio Suspend/Resume" into qt-dev
am:
24e8293439
Change-Id: I944dc3d531dfa8217810acc8862094e9fd41a1de
Ugo Yu [Wed, 5 Jun 2019 04:07:13 +0000 (21:07 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am:
b751ea3a90 am:
2b3330a139 -s ours am:
d9997755f9 -s ours
am:
0f3b13b40e -s ours
am skip reason: subject contains skip directive
Change-Id: I55f9c0499721b51ba077b8743835fbead8edc775
Ugo Yu [Wed, 5 Jun 2019 04:07:07 +0000 (21:07 -0700)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
5240e71881 am:
5f8f0c8b74 -s ours am:
1d7523417e -s ours
am:
1c2cf08476 -s ours
am skip reason: subject contains skip directive
Change-Id: I72d5bbb01e393fb940bad5cc58e51e71f6d5b200
Ugo Yu [Wed, 5 Jun 2019 03:56:43 +0000 (20:56 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am:
b751ea3a90 am:
2b3330a139 -s ours
am:
d9997755f9 -s ours
am skip reason: subject contains skip directive
Change-Id: Idcf3e6f5276592b17693e89c8a56b37c7b445688
Ugo Yu [Wed, 5 Jun 2019 03:56:38 +0000 (20:56 -0700)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
5240e71881 am:
5f8f0c8b74 -s ours
am:
1d7523417e -s ours
am skip reason: subject contains skip directive
Change-Id: I2b8a32d29676a1ea7de1d26f700a5ac1930ea385
TreeHugger Robot [Wed, 5 Jun 2019 03:54:08 +0000 (03:54 +0000)]
Merge "Hearing Aid: properly track audio Suspend/Resume" into qt-dev
Ugo Yu [Wed, 5 Jun 2019 03:51:54 +0000 (20:51 -0700)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am:
b751ea3a90
am:
2b3330a139 -s ours
am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history
Change-Id: I739288fe523814fce940eb2b33aa84d328af92c0
Ugo Yu [Wed, 5 Jun 2019 03:51:42 +0000 (20:51 -0700)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
5240e71881
am:
5f8f0c8b74 -s ours
am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1
9d5a28a536 is in history
Change-Id: I03fe1c7c5a372fd126e9885a4412c2b63b138751
Ugo Yu [Wed, 5 Jun 2019 03:44:59 +0000 (20:44 -0700)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev
am:
b751ea3a90
Change-Id: I4fd4b7d5d0328f40688fa2cd2321b95c12beb99e
Ugo Yu [Wed, 5 Jun 2019 03:44:47 +0000 (20:44 -0700)]
DO NOT MERGE Separate SDP procedure from bonding state (1/2)
am:
5240e71881
Change-Id: I12aa00ba24326d58ce73f15b6ddc82f22201945e
TreeHugger Robot [Wed, 5 Jun 2019 03:26:32 +0000 (03:26 +0000)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev
Ugo Yu [Wed, 5 Jun 2019 03:21:31 +0000 (20:21 -0700)]
Merge changes from topic "am-
d2784a9e-cd2f-4414-b4db-
f53b523a7b87" into oc-dev am:
421f1492da am:
c0f88cbbfd am:
fa24cbf097 am:
7625320871 am:
d3d63acf58
am:
5d89c08fab
Change-Id: I5196f4ea041d630a995d6242f7fc524261956644
Ugo Yu [Wed, 5 Jun 2019 03:21:24 +0000 (20:21 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
553eb90719 am:
fffbd1d3b0 am:
db47d7e348 am:
6976e5f214 skipped:
575b8c810b am:
5b7685e7a2 am:
f4da01925c am:
0a1f845e2a -s ours am:
840a9ba63e -s ours am:
36c6a3069a
am:
4d90d30e29
Change-Id: I53734f9ee25e911849250988d581620fb05ab1e0