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

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Wed, 5 Jun 2019 23:15:28 +0000 (23:15 +0000)]

Merge "OS: Create Alarms on a Handler's thread"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 5 Jun 2019 03:54:08 +0000 (03:54 +0000)]

Merge "Hearing Aid: properly track audio Suspend/Resume" into qt-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Myles Watson [Wed, 5 Jun 2019 03:20:28 +0000 (20:20 -0700)]

Use Start for testing and add a Stop timeout am: 879fbfbed8 am: 92d634aabc
am: 3f6bffdbfd

Change-Id: I44887a92fc0a5b1acfc4a3f96dec33d2a22035d4

commit | commitdiff | tree

Ugo Yu [Wed, 5 Jun 2019 03:19:00 +0000 (20:19 -0700)]

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev am: 1ab9bad8f3 -s ours am: cc98ca6dd2 -s ours am: f92efc538b
am: 248216928f

Change-Id: Iaf471052e3ad3782d266061d8f0208155c8391cc

commit | commitdiff | tree

Ugo Yu [Wed, 5 Jun 2019 03:13:35 +0000 (20:13 -0700)]

[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 9d5a28a536 -s ours am: 4a0d26a8f3 -s ours am: 2bd5b33135
am: 8b5bc7d5b7

Change-Id: I01983cfc8cf826ec3a8eef400a2696539d6900b1

commit | commitdiff | tree

Ugo Yu [Wed, 5 Jun 2019 03:09:35 +0000 (20:09 -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: 477fed3ab2

Change-Id: Ib9672805d5d829f01dded660a34b9ef2b46ed1c3

commit | commitdiff | tree

Ugo Yu [Wed, 5 Jun 2019 03:09:30 +0000 (20:09 -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: b8dde47dfc

Change-Id: I1a2f8da887faaf37f1bcf590b5a6d9a6ff0e8276

commit | commitdiff | tree

Ugo Yu [Wed, 5 Jun 2019 03:05:35 +0000 (20:05 -0700)]

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into oc-dev am: 421f1492da am: c0f88cbbfd am: fa24cbf097 am: 7625320871
am: d3d63acf58

Change-Id: Ie7a9f9d96f6a7cdbb906cfb1faa2d0ad80cf5350

commit | commitdiff | tree

Ugo Yu [Wed, 5 Jun 2019 03:05:29 +0000 (20:05 -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

Change-Id: I55f77ba77a635ca91d384885641d0180562372dd

commit | commitdiff | tree

Ugo Yu [Wed, 5 Jun 2019 03:04:33 +0000 (20:04 -0700)]

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into oc-dev am: 421f1492da am: c0f88cbbfd am: fa24cbf097 am: 7625320871
am: d3d63acf58

Change-Id: Ia40d5f14140399169cded615cbe1fba5a438f50b

commit | commitdiff | tree

Ugo Yu [Wed, 5 Jun 2019 03:04:27 +0000 (20:04 -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

Change-Id: Ibe83621a1cbb8e7be9bbdfecf5a8658b09525d75

commit | commitdiff | tree

Ugo Yu [Wed, 5 Jun 2019 02:59:59 +0000 (19:59 -0700)]

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev am: e488319d82 -s ours am: c7ee86a352
am: c6f6980960

Change-Id: Ifb2a84a0c9540c17634ea35c52b6032301f12172

commit | commitdiff | tree

Jakub Pawlowski [Wed, 5 Jun 2019 02:59:42 +0000 (19:59 -0700)]

Hearing Aid: properly track audio Suspend/Resume am: 054762bcfe am: 463943aa34
am: 13702b2b3a

Change-Id: I785d45549cada1b07f21ea1ccee709d7f3723366

commit | commitdiff | tree

Ugo Yu [Wed, 5 Jun 2019 02:53:41 +0000 (19:53 -0700)]

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev am: 1ab9bad8f3 -s ours am: cc98ca6dd2 -s ours am: f92efc538b
am: cf25e64512

Change-Id: Ia042235ae5f0c7106e0bb013b63411f889ccaf88

commit | commitdiff | tree

Ugo Yu [Wed, 5 Jun 2019 02:53:05 +0000 (19:53 -0700)]

[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 9d5a28a536 -s ours am: 4a0d26a8f3 -s ours am: 2bd5b33135
am: d644d68960

Change-Id: I6d464fa55bb072a92150eb64962ba6a652216360

commit | commitdiff | tree

Ugo Yu [Wed, 5 Jun 2019 02:50:44 +0000 (19:50 -0700)]

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev am: e488319d82 -s ours am: c7ee86a352
am: 8573f48dfe

Change-Id: I53f890ea204a8c3afccd6c95da09301522125114

commit | commitdiff | tree

Ugo Yu [Wed, 5 Jun 2019 02:49:23 +0000 (19:49 -0700)]

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into oc-dev am: 421f1492da am: c0f88cbbfd am: fa24cbf097
am: 7625320871

Change-Id: I4e49782d45cd3132456019979e20e8c63fe58def

commit | commitdiff | tree

Ugo Yu [Wed, 5 Jun 2019 02:49:18 +0000 (19:49 -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 skip reason: subject contains skip directive

Change-Id: Ib56723082e3f9696d84423d254b5830af5e19253

commit | commitdiff | tree

Myles Watson [Wed, 5 Jun 2019 02:43:18 +0000 (19:43 -0700)]

Use Start for testing and add a Stop timeout am: 879fbfbed8
am: 92d634aabc

Change-Id: Ibf32b3fc7b1859b337ed93b950fb36d4032fd84a

commit | commitdiff | tree

Myles Watson [Wed, 5 Jun 2019 02:41:15 +0000 (19:41 -0700)]

Use Start for testing and add a Stop timeout
am: 879fbfbed8

Change-Id: I3ae3d628144a8aadd91f86814513f28413d4d60e

commit | commitdiff | tree

Ugo Yu [Wed, 5 Jun 2019 02:34:05 +0000 (19:34 -0700)]

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev am: 1ab9bad8f3 -s ours am: cc98ca6dd2 -s ours
am: f92efc538b

Change-Id: Ic1ea931b012821a763fba3972694bac0c928aa2b

commit | commitdiff | tree

Ugo Yu [Wed, 5 Jun 2019 02:33:21 +0000 (19:33 -0700)]

[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 9d5a28a536 -s ours am: 4a0d26a8f3 -s ours
am: 2bd5b33135

Change-Id: I70352ac6644193e012ae5be8a3424c8162a9ec4a

commit | commitdiff | tree

Ugo Yu [Wed, 5 Jun 2019 02:32:34 +0000 (19:32 -0700)]

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev am: e488319d82 -s ours
am: c7ee86a352

Change-Id: I8fe19b571402d607c0c5be6a5542f322f15f3ed3

commit | commitdiff | tree

Ugo Yu [Wed, 5 Jun 2019 02:31:14 +0000 (19:31 -0700)]

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into oc-dev am: 421f1492da am: c0f88cbbfd
am: fa24cbf097

Change-Id: I332b22ee718458d95df4e549238244f3117aa294

commit | commitdiff | tree

Ugo Yu [Wed, 5 Jun 2019 02:31:09 +0000 (19:31 -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 skip reason: subject contains skip directive

Change-Id: Ice9aadfba47ba6e146de0123f17d7703b650605a

commit | commitdiff | tree

Jakub Pawlowski [Wed, 5 Jun 2019 02:24:17 +0000 (19:24 -0700)]

Hearing Aid: properly track audio Suspend/Resume am: 054762bcfe
am: 463943aa34

Change-Id: Ia8e18dee8429530605836673a28c5fd1e23c95bd

commit | commitdiff | tree

Ugo Yu [Wed, 5 Jun 2019 02:21:21 +0000 (19:21 -0700)]

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev am: 1ab9bad8f3 -s ours am: cc98ca6dd2 -s ours
am: f92efc538b

Change-Id: Iae50a817a62c92c3455477cf8576471ca86429c3

commit | commitdiff | tree

Ugo Yu [Wed, 5 Jun 2019 02:20:28 +0000 (19:20 -0700)]

[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 9d5a28a536 -s ours am: 4a0d26a8f3 -s ours
am: 2bd5b33135

Change-Id: I4094119aabecb737afce2a82a09d4711ddf52cb3

commit | commitdiff | tree

Ugo Yu [Wed, 5 Jun 2019 02:15:46 +0000 (19:15 -0700)]

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev am: e488319d82 -s ours
am: c7ee86a352

Change-Id: I8a5f0c4846a71dd0ee1146ac7b5a4f7208cf9fa9

commit | commitdiff | tree

Ugo Yu [Thu, 23 May 2019 11:54:41 +0000 (19:54 +0800)]

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

- Do not stay in bonding state if the device is paried but still
  discovering service.
- Report BOND_BONDED to Java after authentication for a classic
  Bluetooth device is completed.
- Send BONDING event to Java when static identity address is
  first obtained during crosskey pairing
- Send BONDING event to Java for the initial random address
  before send BONDED event
- Do not send bond event for static identity address when SDP is done.
- Make sure pairing control block always get cleaned up when both SDP
  and pairing are done
- Send empty UUIDs to Java layer to unblock bonding intent broadcast
  when SDP fails

Bug: 79703832
Test: runtest bluetooth, regression test
Change-Id: I60d8883e6d095b440cce49686a2049c8b5660235
Merged-In: I8a98ba2178039e25c65fc701855066a8788312e6

commit | commitdiff | tree

Ugo Yu [Wed, 5 Jun 2019 01:55:52 +0000 (18:55 -0700)]

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into oc-dev am: 421f1492da
am: c0f88cbbfd

Change-Id: I5f81bb5a561e3da0a06d4d75f99f7894648b82d6

system/bt

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.