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

weichinweng [Wed, 12 Jun 2019 16:55:09 +0000 (09:55 -0700)]

[automerger skipped] Load gatt_database if it is empty in bta_gattc_process_indicate am: d8cdc6c2b8 am: 94b4587208 -s ours
am: 62f0ddf57f -s ours
am skip reason: change_id Id3f3f0f33d5e0469a6f2ac6612fa9f5ea0b24142 with SHA1 d8cdc6c2b8 is in history

Change-Id: I196208c16f1159bde4edc452722ef0c03bfc066e

commit | commitdiff | tree

weichinweng [Wed, 12 Jun 2019 16:53:24 +0000 (09:53 -0700)]

[automerger skipped] Load gatt_database if it is empty in bta_gattc_process_indicate am: d8cdc6c2b8 -s ours am: 20e4310319 -s ours
am: 93f3edc0d6 -s ours
am skip reason: change_id Id3f3f0f33d5e0469a6f2ac6612fa9f5ea0b24142 with SHA1 9a169893a8 is in history

Change-Id: Ifc0ff1d1b9e34f654b567f118e6f968442774d6e

commit | commitdiff | tree

weichinweng [Wed, 12 Jun 2019 16:43:59 +0000 (09:43 -0700)]

[automerger skipped] Load gatt_database if it is empty in bta_gattc_process_indicate am: d8cdc6c2b8
am: 94b4587208 -s ours
am skip reason: change_id Id3f3f0f33d5e0469a6f2ac6612fa9f5ea0b24142 with SHA1 d8cdc6c2b8 is in history

Change-Id: I84acc7fc1cdf3d2d419c2af53131bea2bdbe6c65

commit | commitdiff | tree

weichinweng [Wed, 12 Jun 2019 16:34:24 +0000 (09:34 -0700)]

[automerger skipped] Load gatt_database if it is empty in bta_gattc_process_indicate am: d8cdc6c2b8 -s ours
am: 20e4310319 -s ours
am skip reason: change_id Id3f3f0f33d5e0469a6f2ac6612fa9f5ea0b24142 with SHA1 9a169893a8 is in history

Change-Id: Iffde9fa26fd1597ddaca561b0818c8f9cdb412cb

commit | commitdiff | tree

weichinweng [Wed, 12 Jun 2019 16:26:52 +0000 (09:26 -0700)]

[automerger skipped] Load gatt_database if it is empty in bta_gattc_process_indicate
am: d8cdc6c2b8 -s ours
am skip reason: change_id Id3f3f0f33d5e0469a6f2ac6612fa9f5ea0b24142 with SHA1 9a169893a8 is in history

Change-Id: I83a3dc9edc8edffa560caab8dbf5edfd2aa4cb64

commit | commitdiff | tree

weichinweng [Wed, 12 Jun 2019 16:24:44 +0000 (09:24 -0700)]

Load gatt_database if it is empty in bta_gattc_process_indicate
am: d8cdc6c2b8

Change-Id: Ic21850a535194b85aa558fe97b8118e0e089581e

commit | commitdiff | tree

weichinweng [Wed, 12 Jun 2019 07:58:01 +0000 (00:58 -0700)]

Load gatt_database if it is empty in bta_gattc_process_indicate am: 9a169893a8 am: f9b7dfff77 am: 0f2f9e301c
am: c92a231839

Change-Id: I0095e8985dff95c331138e984402089a05173a1c

commit | commitdiff | tree

weichinweng [Wed, 12 Jun 2019 07:54:00 +0000 (00:54 -0700)]

Load gatt_database if it is empty in bta_gattc_process_indicate am: 9a169893a8 am: f9b7dfff77
am: 0f2f9e301c

Change-Id: I31d67fc3c52ddc35fc2b8d240fc0af7670a82e84

commit | commitdiff | tree

weichinweng [Wed, 12 Jun 2019 07:47:59 +0000 (00:47 -0700)]

Load gatt_database if it is empty in bta_gattc_process_indicate am: 9a169893a8
am: f9b7dfff77

Change-Id: Iccffc6d9b8eef4f3f5d753d7d58633ead92c86db

commit | commitdiff | tree

weichinweng [Wed, 12 Jun 2019 07:42:58 +0000 (00:42 -0700)]

Load gatt_database if it is empty in bta_gattc_process_indicate
am: 9a169893a8

Change-Id: I962e5da7dae3f75965683d93b35cdbcbf14a7c7e

commit | commitdiff | tree

weichinweng [Tue, 11 Jun 2019 14:02:46 +0000 (22:02 +0800)]

Load gatt_database if it is empty in bta_gattc_process_indicate

If Service Changed indication is received but gatt_database is empty,
will try to load database from storage.

Bug: 131814072
Bug: 134994428
Test: 1.CTS Bluetooth LE Secure Test. 2.Unit test.
3. Pair BLE device via APP. 4. Pair device via Bluetooth Setting

Change-Id: Id3f3f0f33d5e0469a6f2ac6612fa9f5ea0b24142
Merged-In: Id3f3f0f33d5e0469a6f2ac6612fa9f5ea0b24142

commit | commitdiff | tree

weichinweng [Tue, 11 Jun 2019 14:02:46 +0000 (22:02 +0800)]

Load gatt_database if it is empty in bta_gattc_process_indicate

If Service Changed indication is received but gatt_database is empty,
will try to load database from storage.

Bug: 131814072
Bug: 134994428
Test: 1.CTS Bluetooth LE Secure Test. 2.Unit test.
3. Pair BLE device via APP. 4. Pair device via Bluetooth Setting

Change-Id: Id3f3f0f33d5e0469a6f2ac6612fa9f5ea0b24142

commit | commitdiff | tree

Jakub Pawlowski [Tue, 11 Jun 2019 22:31:39 +0000 (15:31 -0700)]

Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate" am: 1ae89b7db2 am: 529cecd2d8
am: 1aa5e8928c

Change-Id: I0c256d229ec06b4bfded2710027522211639c2b0

commit | commitdiff | tree

Jakub Pawlowski [Tue, 11 Jun 2019 22:30:32 +0000 (15:30 -0700)]

Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate" am: 1ae89b7db2 am: e05ea5ed11
am: e4da74df93

Change-Id: I8c55859d9291fcb50d786e53b64da3a73cce770a

commit | commitdiff | tree

Jakub Pawlowski [Tue, 11 Jun 2019 22:13:51 +0000 (15:13 -0700)]

Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate" am: 1ae89b7db2
am: 529cecd2d8

Change-Id: I830b783e743ac2201e2c046b8b8cab83c5e08aa7

commit | commitdiff | tree

Jakub Pawlowski [Tue, 11 Jun 2019 22:08:20 +0000 (15:08 -0700)]

Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate" am: 1ae89b7db2
am: e05ea5ed11

Change-Id: Id7bd8ee1fb0492e137525f78c3202d1cd5197e96

commit | commitdiff | tree

Jakub Pawlowski [Tue, 11 Jun 2019 22:03:08 +0000 (15:03 -0700)]

Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate"
am: 1ae89b7db2

Change-Id: I1b73fc8678d5db13d6c8886cb3d24d922e00ef4d

commit | commitdiff | tree

Jakub Pawlowski [Tue, 11 Jun 2019 22:01:23 +0000 (15:01 -0700)]

Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate"
am: 1ae89b7db2

Change-Id: I7dd5e73de79498e378d24140a3ff4790a4138dac

commit | commitdiff | tree

Jakub Pawlowski [Tue, 11 Jun 2019 19:00:58 +0000 (12:00 -0700)]

Merge "Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate"" am: 103addf9f7 am: 288ba569ff am: bc8637d9d0
am: 293565a1f9

Change-Id: I39cdef420b319aee0135d28ae2808083376851d1

commit | commitdiff | tree

Jakub Pawlowski [Tue, 11 Jun 2019 18:47:03 +0000 (11:47 -0700)]

Merge "Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate"" am: 103addf9f7 am: 288ba569ff
am: bc8637d9d0

Change-Id: I291fd125f79c4a5935445e6bb1864f8a68815bba

commit | commitdiff | tree

Jakub Pawlowski [Tue, 11 Jun 2019 18:42:02 +0000 (11:42 -0700)]

Merge "Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate"" am: 103addf9f7
am: 288ba569ff

Change-Id: I85c677627970ba098c1574509d9072e75e4abb98

commit | commitdiff | tree

Jakub Pawlowski [Tue, 11 Jun 2019 11:30:04 +0000 (11:30 +0000)]

Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate"

This reverts commit ffc95919835bbf89d635516955bff1b3b8a17641.

Reason for revert: breaks HA bonding from within app.

Bug: 134942525
Change-Id: I824391b1c84b535d7f251e176a5169eb79921c7f

commit | commitdiff | tree

Jakub Pawlowski [Tue, 11 Jun 2019 18:37:02 +0000 (11:37 -0700)]

Merge "Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate""
am: 103addf9f7

Change-Id: I886067b43e87be5edce5b7486945e71d20875b77

commit | commitdiff | tree

Jakub Pawlowski [Tue, 11 Jun 2019 18:18:48 +0000 (18:18 +0000)]

Merge "Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate""

commit | commitdiff | tree

Jakub Pawlowski [Tue, 11 Jun 2019 11:30:04 +0000 (11:30 +0000)]

Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate"

This reverts commit ffc95919835bbf89d635516955bff1b3b8a17641.

Reason for revert: breaks HA bonding from within app.

Bug: 134942525
Change-Id: I824391b1c84b535d7f251e176a5169eb79921c7f

commit | commitdiff | tree

Myles Watson [Tue, 11 Jun 2019 01:43:26 +0000 (18:43 -0700)]

OS: Update Handler unittest am: 6a3d2769e5 am: 06a6e601f3 am: 94bec5ac69
am: 246cab0f96

Change-Id: I1db0db982aa8c36ee11ec7141255d89e0307d647

commit | commitdiff | tree

Myles Watson [Tue, 11 Jun 2019 01:43:21 +0000 (18:43 -0700)]

OS: Don't hold the lock while the callback runs am: 5831f4165c am: 5f46294fc0 am: 686d8189a8
am: aa19aa6d94

Change-Id: I51221b5f65aefd808cd805aa0111d568220de540

commit | commitdiff | tree

Myles Watson [Tue, 11 Jun 2019 01:22:30 +0000 (18:22 -0700)]

OS: Update Handler unittest am: 6a3d2769e5 am: 06a6e601f3
am: 94bec5ac69

Change-Id: I705480c9958faebb9e2fea0744a84a4fc97034f6

commit | commitdiff | tree

Myles Watson [Tue, 11 Jun 2019 01:22:25 +0000 (18:22 -0700)]

OS: Don't hold the lock while the callback runs am: 5831f4165c am: 5f46294fc0
am: 686d8189a8

Change-Id: I723b1fb609a808b0786dcdadcdd906af5c83108b

commit | commitdiff | tree

Myles Watson [Tue, 11 Jun 2019 01:16:54 +0000 (18:16 -0700)]

OS: Update Handler unittest am: 6a3d2769e5
am: 06a6e601f3

Change-Id: I7edc71cc93e7fb3ab4822d70efa8c5a7bca04d38

commit | commitdiff | tree

Myles Watson [Tue, 11 Jun 2019 01:16:50 +0000 (18:16 -0700)]

OS: Don't hold the lock while the callback runs am: 5831f4165c
am: 5f46294fc0

Change-Id: I8681972873d01cb0d31e44e558a9f778e19161a0

commit | commitdiff | tree

Myles Watson [Tue, 11 Jun 2019 01:06:54 +0000 (18:06 -0700)]

OS: Update Handler unittest
am: 6a3d2769e5

Change-Id: I6435bafbaaaeda1cc61c9328d8c5a803be8bc76a

commit | commitdiff | tree

Myles Watson [Tue, 11 Jun 2019 01:06:51 +0000 (18:06 -0700)]

OS: Don't hold the lock while the callback runs
am: 5831f4165c

Change-Id: I4e478ca80801a896b5a46dea16475fb14eb3a6cb

commit | commitdiff | tree

The Android Open Source Project [Mon, 10 Jun 2019 20:43:49 +0000 (13:43 -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
am: fd6ba9edfb -s ours
am skip reason: subject contains skip directive

Change-Id: Iaa8fc036a190d3da20050044cf9de05d1bfbb7f3

commit | commitdiff | tree

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

commit | commitdiff | tree

Myles Watson [Fri, 7 Jun 2019 15:57:16 +0000 (08:57 -0700)]

OS: Update Handler unittest

Test: bluetooth_test_gd
Change-Id: I14bb8c8852d8749e9c531ac18f18a39c92dae922

commit | commitdiff | tree

Myles Watson [Mon, 10 Jun 2019 20:10:52 +0000 (13:10 -0700)]

OS: Don't hold the lock while the callback runs

Test: bluetooth_test_gd \
--gtest_filter=*unregister_from_different_thread*
Change-Id: Icd820cd1a68a6ec26f0284b5c2bd7ba673bebb0c

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Martin Brabham [Sat, 8 Jun 2019 05:11:35 +0000 (22:11 -0700)]

Merge "Confirm the presence of BT key when BT ON am: bd8c5865c9 am: 9b1e7741d1" into qt-r1-dev-plus-aosp
am: bcec6d5ab1

Change-Id: I6128e0230e45bd95181bbf3125f6a5a8817bd835

commit | commitdiff | tree

Martin Brabham [Sat, 8 Jun 2019 05:11:15 +0000 (22:11 -0700)]

Confirm the presence of BT key when BT ON am: bd8c5865c9 am: fac802a491
am: fd107e76b2

Change-Id: Ib5f8bbf6be3cc33a5f6590413605ddd6e8399a7d

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jakub Pawlowski [Fri, 7 Jun 2019 10:38:40 +0000 (03:38 -0700)]

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: dfffcb7b43 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1 461f0b4739 is in history

Change-Id: I724f49cbc21a99f3703efd6685338eb707415c28

commit | commitdiff | tree

Jakub Pawlowski [Fri, 7 Jun 2019 10:38:18 +0000 (03:38 -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: 1ef90ca714 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1 461f0b4739 is in history

Change-Id: I6bd6da6b97b35026019a067d5fc925c81798283f

commit | commitdiff | tree

Jakub Pawlowski [Fri, 7 Jun 2019 10:37:56 +0000 (03:37 -0700)]

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: ca3c59cf41 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie73b1d185aecb3ef1ef90d897074d57110e4ee77

commit | commitdiff | tree

Jakub Pawlowski [Fri, 7 Jun 2019 10:37:39 +0000 (03:37 -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: e8f22f738e -s ours
am skip reason: subject contains skip directive

Change-Id: I0863507caaeac72fdd6c6476addeef3fccf7603f

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Xin Li [Fri, 7 Jun 2019 07:45:37 +0000 (00:45 -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
am: 774668c919 -s ours
am skip reason: subject contains skip directive

Change-Id: I4b8c2a175e36a9d0126e5f71792887976df058a9

commit | commitdiff | tree

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

commit | commitdiff | tree

Xin Li [Fri, 7 Jun 2019 07:35:15 +0000 (00:35 -0700)]

[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master am: 11c90c6751 -s ours am: d1788a8ba0
am: 9347a24bcd -s ours
am skip reason: subject contains skip directive

Change-Id: I345edff04210be59c29b207534d62550202e0001

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jakub Pawlowski [Thu, 6 Jun 2019 19:21:57 +0000 (12:21 -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: 56345953a7 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie59a940b61586690145354589ad653e66a78f037

commit | commitdiff | tree

Jakub Pawlowski [Thu, 6 Jun 2019 19:21:38 +0000 (12:21 -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: c3acf3dab5 -s ours
am skip reason: subject contains skip directive

Change-Id: Iee5714d10b53430d7a8014eebde5b0b9e598dfc3

commit | commitdiff | tree

Jakub Pawlowski [Thu, 6 Jun 2019 19:20:15 +0000 (12:20 -0700)]

Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am: c887dd6ed1 am: 49d1907d67
am: 3ab591b3dc

Change-Id: I81f680c6905a9e903d763f5de3d942bf20ea5e55

commit | commitdiff | tree

Jakub Pawlowski [Thu, 6 Jun 2019 19:16:58 +0000 (12:16 -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: f7e5ff858c -s ours
am skip reason: subject contains skip directive

Change-Id: I447be8088a62555a1178201f7e9558eaa6a596e1

commit | commitdiff | tree

Jakub Pawlowski [Thu, 6 Jun 2019 19:14:26 +0000 (12:14 -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: dc2c66d3c7 -s ours
am skip reason: subject contains skip directive

Change-Id: I371daac6c0dbe39a97b468e5aa09aa80f7467a7e

commit | commitdiff | tree

Jakub Pawlowski [Thu, 6 Jun 2019 19:11:42 +0000 (12:11 -0700)]

Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am: c887dd6ed1 am: 8377e16f88
am: 5ae6c045a0

Change-Id: I56f6895710ff074be2a583e8ed21bee6f7dba85a

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

system/bt

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.