OSDN Git Service
Ugo Yu [Fri, 8 Feb 2019 20:50:04 +0000 (12:50 -0800)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am:
99495df519 -s ours am:
8d550cccd6 -s ours am:
8500500386 -s ours am:
5980eefcfb -s ours
am:
fb199e7a56 -s ours
am skip reason: subject contains skip directive
Change-Id: Ida3c731f69050002debc52cdb5de45045df7cd4a
Ugo Yu [Fri, 8 Feb 2019 20:49:11 +0000 (12:49 -0800)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
0989441858 -s ours am:
a6d6406255 -s ours am:
feeb53795a -s ours am:
e14f845fac -s ours
am:
9351561a1b -s ours
am skip reason: subject contains skip directive
Change-Id: Ife8850a2eabec7a21f3a421b6d058cf231749e9f
Ugo Yu [Fri, 8 Feb 2019 20:47:56 +0000 (12:47 -0800)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am:
99495df519 -s ours am:
8d550cccd6 -s ours am:
8500500386 -s ours
am:
5980eefcfb -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1
dc14eb8ba0 is in history
Change-Id: Ie6310a5c45da530dec6face297e14bb544314a87
Ugo Yu [Fri, 8 Feb 2019 20:46:41 +0000 (12:46 -0800)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
0989441858 -s ours am:
a6d6406255 -s ours am:
feeb53795a -s ours
am:
e14f845fac -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1
dc14eb8ba0 is in history
Change-Id: I6e5653ea9c7e25d17dac4a73842a4e3b573d5521
Ugo Yu [Fri, 8 Feb 2019 20:42:30 +0000 (12:42 -0800)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am:
99495df519 -s ours am:
8d550cccd6 -s ours
am:
8500500386 -s ours
am skip reason: subject contains skip directive
Change-Id: I4f30022298edd7521c895bdceb743662e915b229
Ugo Yu [Fri, 8 Feb 2019 20:41:07 +0000 (12:41 -0800)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
0989441858 -s ours am:
a6d6406255 -s ours
am:
feeb53795a -s ours
am skip reason: subject contains skip directive
Change-Id: Ie86e28c3ee0c779e9f4df6a1279750e67765eec9
Ugo Yu [Fri, 8 Feb 2019 20:38:28 +0000 (12:38 -0800)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am:
99495df519 -s ours
am:
8d550cccd6 -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1
f3681c8616 is in history
Change-Id: Iaf7c1aadcfd65ed6a82b0c3bc98ff121046f70d2
Ugo Yu [Fri, 8 Feb 2019 20:37:26 +0000 (12:37 -0800)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
0989441858 -s ours
am:
a6d6406255 -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1
f3681c8616 is in history
Change-Id: Ie5679c43d4e59f3028a115558763baae8d31ec73
Ugo Yu [Fri, 8 Feb 2019 20:34:11 +0000 (12:34 -0800)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev
am:
99495df519 -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1
0989441858 is in history
Change-Id: I6fb78cdd8f4c748d6cafa85bdb1f8f60d676373b
Ugo Yu [Fri, 8 Feb 2019 20:33:37 +0000 (12:33 -0800)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2)
am:
0989441858 -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1
edd7e731ed is in history
Change-Id: Ied8e02f8c14ed6190cc9baebf688359d682b6d00
TreeHugger Robot [Fri, 8 Feb 2019 20:19:42 +0000 (20:19 +0000)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev
Ugo Yu [Fri, 8 Feb 2019 08:22:26 +0000 (00:22 -0800)]
Merge changes from topic "am-
43952131-a4db-4e42-bfef-
2d44a29b3fac" into oc-dev am:
c59317a10a am:
d73d5ace07 am:
0cd9890f74 am:
02bf171fb2
am:
9b6686bd90
Change-Id: Id56d085774c92ca361ad58c9c24b69cd60e99920
Ugo Yu [Fri, 8 Feb 2019 08:18:21 +0000 (00:18 -0800)]
Merge changes from topic "am-
43952131-a4db-4e42-bfef-
2d44a29b3fac" into oc-dev am:
c59317a10a am:
d73d5ace07 am:
0cd9890f74
am:
02bf171fb2
Change-Id: I0392075e25fa78dfb35a253f90ee9e76ae0d93e7
Ugo Yu [Fri, 8 Feb 2019 08:14:17 +0000 (00:14 -0800)]
Merge changes from topic "am-
43952131-a4db-4e42-bfef-
2d44a29b3fac" into oc-dev am:
c59317a10a am:
d73d5ace07
am:
0cd9890f74
Change-Id: I80a5aea488949c646baf1e7f514878ec1cba38e3
Ugo Yu [Fri, 8 Feb 2019 08:10:13 +0000 (00:10 -0800)]
Merge changes from topic "am-
43952131-a4db-4e42-bfef-
2d44a29b3fac" into oc-dev am:
c59317a10a
am:
d73d5ace07
Change-Id: I276abc4b3d069c7700e37cf6c2a34df380b07035
Ugo Yu [Fri, 8 Feb 2019 08:06:25 +0000 (00:06 -0800)]
Merge changes from topic "am-
43952131-a4db-4e42-bfef-
2d44a29b3fac" into oc-dev
am:
c59317a10a
Change-Id: I424449c094db3c75d1f76f7d397b7b510d1a8959
TreeHugger Robot [Fri, 8 Feb 2019 07:54:10 +0000 (07:54 +0000)]
Merge changes from topic "am-
43952131-a4db-4e42-bfef-
2d44a29b3fac" into oc-dev
* changes:
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910 am:
c29c3aa408 am:
70ab44a424 skipped:
4e26a1fa5d
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910 am:
c29c3aa408 am:
70ab44a424
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910 am:
c29c3aa408
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed
DO NOT MERGE Separate SDP procedure from bonding state (1/2)
Zach Johnson [Fri, 8 Feb 2019 02:24:44 +0000 (18:24 -0800)]
Update owners am:
5f896dff62 am:
71049c3fc0
am:
0e02dd3031
Change-Id: Ibfadecc21d8dc8f342626f8252d5344061c73f1a
Zach Johnson [Fri, 8 Feb 2019 01:54:11 +0000 (17:54 -0800)]
Update owners am:
5f896dff62
am:
71049c3fc0
Change-Id: I3a0d107c701e81e41ac126a359288e516680b8d9
Zach Johnson [Fri, 8 Feb 2019 01:37:55 +0000 (17:37 -0800)]
Update owners
am:
5f896dff62
Change-Id: I6b148cf88d294200eb8df4d5e068092fe6b5d4b2
Hansong Zhang [Fri, 8 Feb 2019 01:17:46 +0000 (17:17 -0800)]
Merge "btm_proc_smp_cback: Don't access p_dev_rec if freed" into oc-dev am:
4ac889b785 am:
c87e949d53 am:
d59c9ec72e am:
c3ea071167
am:
910c8feac0
Change-Id: Ibb8b3ff744c729bccc7b9628e1459c548c480550
Ugo Yu [Fri, 8 Feb 2019 01:17:04 +0000 (17:17 -0800)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev am:
c48874b71b -s ours am:
dc9d0d8f17
am:
be8392d34a -s ours
am skip reason: subject contains skip directive
Change-Id: I917af301670f5c59618faeb220a5c74c52675418
Ugo Yu [Fri, 8 Feb 2019 01:15:28 +0000 (17:15 -0800)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
f3681c8616 -s ours am:
9028a31640
am:
b0021fea56 -s ours
am skip reason: subject contains skip directive
Change-Id: I98be04471bc491fef37a280039145997b177984c
Ugo Yu [Fri, 8 Feb 2019 01:15:07 +0000 (17:15 -0800)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev am:
7799b0915e
am:
bfdf4cdb8d -s ours
am skip reason: subject contains skip directive
Change-Id: Ia5e32ecca08f37c390615fa3ee0e33ad39c0f175
Hansong Zhang [Fri, 8 Feb 2019 01:07:43 +0000 (17:07 -0800)]
Merge "btm_proc_smp_cback: Don't access p_dev_rec if freed" into oc-dev am:
4ac889b785 am:
c87e949d53 am:
d59c9ec72e
am:
c3ea071167
Change-Id: I0035c015607c57ce66bc13d820613e0f8aacf003
Ugo Yu [Fri, 8 Feb 2019 01:07:00 +0000 (17:07 -0800)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev am:
c48874b71b -s ours
am:
dc9d0d8f17
Change-Id: Iaaccf1ae6b1c600c5d6b3d4b7e525a116db10748
Ugo Yu [Fri, 8 Feb 2019 01:06:02 +0000 (17:06 -0800)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
f3681c8616 -s ours
am:
9028a31640
Change-Id: I31a0260c1ff35d1452b214139ccedb0aa0edd6db
Ugo Yu [Fri, 8 Feb 2019 01:05:33 +0000 (17:05 -0800)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev
am:
7799b0915e
Change-Id: I840df80cb967dccce932634818c901b79e52b2ff
Hansong Zhang [Fri, 8 Feb 2019 00:50:16 +0000 (16:50 -0800)]
Merge "btm_proc_smp_cback: Don't access p_dev_rec if freed" into oc-dev am:
4ac889b785 am:
c87e949d53
am:
d59c9ec72e
Change-Id: I31957dc7e323364de3529b3375835dd4cb7a501d
Hansong Zhang [Fri, 8 Feb 2019 00:46:11 +0000 (16:46 -0800)]
Merge "btm_proc_smp_cback: Don't access p_dev_rec if freed" into oc-dev am:
4ac889b785
am:
c87e949d53
Change-Id: I6875480db5a714d721d20ead2111627f4ab5a68e
Ugo Yu [Fri, 8 Feb 2019 00:44:52 +0000 (16:44 -0800)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev
am:
c48874b71b -s ours
am skip reason: subject contains skip directive
Change-Id: Ibcaf4a7d743ec0cfeebb8aecc7bab2bf3b88615d
Ugo Yu [Fri, 8 Feb 2019 00:44:14 +0000 (16:44 -0800)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2)
am:
f3681c8616 -s ours
am skip reason: subject contains skip directive
Change-Id: I6a7d8107caa959212e0d93e708dd87851199a2c8
Hansong Zhang [Fri, 8 Feb 2019 00:42:12 +0000 (16:42 -0800)]
Merge "btm_proc_smp_cback: Don't access p_dev_rec if freed" into oc-dev
am:
4ac889b785
Change-Id: I3a99684487593468b89948aa9d3be99e5ed705f4
TreeHugger Robot [Fri, 8 Feb 2019 00:31:40 +0000 (00:31 +0000)]
Merge "btm_proc_smp_cback: Don't access p_dev_rec if freed" into oc-dev
TreeHugger Robot [Fri, 8 Feb 2019 00:27:55 +0000 (00:27 +0000)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev
TreeHugger Robot [Thu, 7 Feb 2019 23:42:23 +0000 (23:42 +0000)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev
Zach Johnson [Thu, 7 Feb 2019 23:08:57 +0000 (15:08 -0800)]
Update owners
remove folks not on team anymore, add new folks
Change-Id: Ib5834ecb068b8149b8b8f53373100786d4533ea0
Hansong Zhang [Thu, 7 Feb 2019 21:38:36 +0000 (13:38 -0800)]
Merge changes from topic "am-
5380790e-42fb-4784-96c0-
4412e4fdccd0" into oc-dev am:
e145805974 am:
9b0e9a32bb am:
53e961c220 am:
8c5cac9acf
am:
c233f15a84
Change-Id: I10839ec6e41cc865835b8291b0b89f1c833c0d68
Hansong Zhang [Thu, 7 Feb 2019 21:32:37 +0000 (13:32 -0800)]
Merge changes from topic "am-
5380790e-42fb-4784-96c0-
4412e4fdccd0" into oc-dev am:
e145805974 am:
9b0e9a32bb am:
53e961c220
am:
8c5cac9acf
Change-Id: I8e49f1c168d9fc71279321b0d1b5762af845dee7
Hansong Zhang [Thu, 7 Feb 2019 21:25:32 +0000 (13:25 -0800)]
Merge changes from topic "am-
5380790e-42fb-4784-96c0-
4412e4fdccd0" into oc-dev am:
e145805974 am:
9b0e9a32bb
am:
53e961c220
Change-Id: I9fc3a00e1b38236aaa1016ef0c422fe5303f407b
Hansong Zhang [Thu, 7 Feb 2019 21:21:26 +0000 (13:21 -0800)]
Merge changes from topic "am-
5380790e-42fb-4784-96c0-
4412e4fdccd0" into oc-dev am:
e145805974
am:
9b0e9a32bb
Change-Id: I02f1344805f748024dc28e05fd0afe67a6afb61a
Hansong Zhang [Thu, 7 Feb 2019 21:17:35 +0000 (13:17 -0800)]
Merge changes from topic "am-
5380790e-42fb-4784-96c0-
4412e4fdccd0" into oc-dev
am:
e145805974
Change-Id: Iaa78778cedd6e04d3cf7d009b81a9599658e6583
TreeHugger Robot [Thu, 7 Feb 2019 21:07:56 +0000 (21:07 +0000)]
Merge changes from topic "am-
5380790e-42fb-4784-96c0-
4412e4fdccd0" into oc-dev
* changes:
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2 am:
a244a4072c am:
90265d4ee0 skipped:
84ba34d57a
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2 am:
a244a4072c am:
90265d4ee0
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2 am:
a244a4072c
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce
DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed
Myles Watson [Thu, 7 Feb 2019 04:21:21 +0000 (20:21 -0800)]
Merge "Add a ClassOfDevice type" am:
1127b7ca1e am:
1d4d929b97
am:
2e41f8daad
Change-Id: I42f4787ba57af56c936c56cdf412fd2daa194075
Myles Watson [Thu, 7 Feb 2019 04:17:16 +0000 (20:17 -0800)]
Merge "Add a ClassOfDevice type" am:
1127b7ca1e
am:
1d4d929b97
Change-Id: I90ba1f5a150a1e21bb0a70c7f91d2c610a14895c
Cheney Ni [Thu, 7 Feb 2019 04:13:20 +0000 (20:13 -0800)]
Merge "Add audio channel of Bluetooth Audio Hal v2 for Hearing Aid" am:
d5b9a48dd4 am:
4ba03befa9
am:
8e5c1456c6
Change-Id: I42c19a25660b1994f3f3aa7bcd879658dfc8b29c
Myles Watson [Thu, 7 Feb 2019 04:13:16 +0000 (20:13 -0800)]
Merge "Add a ClassOfDevice type"
am:
1127b7ca1e
Change-Id: I24c9a22d2dfb000c6778fde7150038445c90b218
Cheney Ni [Thu, 7 Feb 2019 04:05:13 +0000 (20:05 -0800)]
Merge "Add audio channel of Bluetooth Audio Hal v2 for Hearing Aid" am:
d5b9a48dd4
am:
4ba03befa9
Change-Id: Id21a5e868ecc1463431ef7be0d55f04503df3bb9
Treehugger Robot [Thu, 7 Feb 2019 04:04:02 +0000 (04:04 +0000)]
Merge "Add a ClassOfDevice type"
Jack He [Thu, 7 Feb 2019 03:55:02 +0000 (19:55 -0800)]
Merge "Metrics: Log SDP attributes to statsd" am:
56906d7952 am:
39f25666c6
am:
90b32410c1
Change-Id: Ia65e328c1e266a646ac016dd312d6c4b843854d3
Cheney Ni [Thu, 7 Feb 2019 03:51:29 +0000 (19:51 -0800)]
Merge "Add audio channel of Bluetooth Audio Hal v2 for Hearing Aid"
am:
d5b9a48dd4
Change-Id: I1d553f74fb1c81b9796225cf3a0fba2faa43c6b4
Jack He [Thu, 7 Feb 2019 03:49:56 +0000 (19:49 -0800)]
Merge "Metrics: Log SDP attributes to statsd" am:
56906d7952
am:
39f25666c6
Change-Id: I758d891e86ab6a23559907948fa0e8cdcc9286ac
Jack He [Thu, 7 Feb 2019 03:46:54 +0000 (19:46 -0800)]
Merge "Metrics: Log SDP attributes to statsd"
am:
56906d7952
Change-Id: I0bf9a363b011ad546824b9826b9721e391cf5b5a
Treehugger Robot [Thu, 7 Feb 2019 03:39:00 +0000 (03:39 +0000)]
Merge "Add audio channel of Bluetooth Audio Hal v2 for Hearing Aid"
Treehugger Robot [Thu, 7 Feb 2019 03:35:01 +0000 (03:35 +0000)]
Merge "Metrics: Log SDP attributes to statsd"
Jack He [Sat, 2 Feb 2019 02:30:21 +0000 (18:30 -0800)]
Metrics: Log SDP attributes to statsd
* Log ProtocolDescriptorList's protocol version field to statsd
* Log BluetoothProfileDescriptorList's profile version field to statsd
* Log SupportedFeatures for A2DP, HFP, AVRCP, PBAP, MAP to statsd
* Log SDP metrics before we disconnect from L2CAP during SDP discovery
* Values are logged in small endian array
* Do this logging before we declare an SDP search is done
Bug:
112969790
Test: make, test drive with statsd
Change-Id: Idd340e495ecb85abc27de2b2d71305ee5218b43c
Cheney Ni [Wed, 12 Dec 2018 12:20:28 +0000 (20:20 +0800)]
Add audio channel of Bluetooth Audio Hal v2 for Hearing Aid
This brings a new interface for Hearing Aid to communicate with audio.
Both audio control and data path go through the new Bluetooth audio
HAL and is similar to A2DP usecase. It initials this interface of client
side and get audio provider at setup and manage session with audio hal.
There is a system property to switch between the UIPC socket and the
Bluetooth Audio Hal v2 interface:
persist.bluetooth.bluetooth_audio_hal.enabled
Bug:
111519504
Bug:
120222104
Test: manual test with Hearing Aid
TODO: Pass audio matadata into Hearing Aid service
Change-Id: I648775d61a8a4fe4fa680dd31ffc39fc89267c06
Cheney Ni [Thu, 7 Feb 2019 00:32:16 +0000 (16:32 -0800)]
Merge "Add stack side interface for Bluetooth audio HAL V2" am:
9ac498e5f3 am:
03b104281d
am:
46726e5c84
Change-Id: I5bac84223ddf1938c87b258fcb558154e6780c10
Cheney Ni [Thu, 7 Feb 2019 00:14:14 +0000 (16:14 -0800)]
Merge "Add stack side interface for Bluetooth audio HAL V2" am:
9ac498e5f3
am:
03b104281d
Change-Id: I76c95b532437bb754685cd07ebe71d2f8285c583
Cheney Ni [Thu, 7 Feb 2019 00:10:11 +0000 (16:10 -0800)]
Merge "Add stack side interface for Bluetooth audio HAL V2"
am:
9ac498e5f3
Change-Id: Id1b7339721558e2772eca4ce9eebb57a51a04f9d
Treehugger Robot [Thu, 7 Feb 2019 00:00:28 +0000 (00:00 +0000)]
Merge "Add stack side interface for Bluetooth audio HAL V2"
TreeHugger Robot [Wed, 6 Feb 2019 23:06:33 +0000 (23:06 +0000)]
Merge "Implement key attestation using AndroidKeystore."
Joseph Pirozzo [Wed, 6 Feb 2019 21:32:08 +0000 (13:32 -0800)]
Merge "PBAP Client SDP record" am:
02efe2113f am:
aa513eab75
am:
4e07a549db
Change-Id: I30acd0933d6d3419e9632643a7381e4a10faecb8
Joseph Pirozzo [Wed, 6 Feb 2019 21:26:06 +0000 (13:26 -0800)]
Merge "PBAP Client SDP record" am:
02efe2113f
am:
aa513eab75
Change-Id: Ica014e4e2c09b033797f42e10477ab2d873da510
Joseph Pirozzo [Wed, 6 Feb 2019 21:21:54 +0000 (13:21 -0800)]
Merge "PBAP Client SDP record"
am:
02efe2113f
Change-Id: Ie681046a23a481471608df00d1367271a6be0229
Cheney Ni [Thu, 8 Nov 2018 08:41:02 +0000 (16:41 +0800)]
Add stack side interface for Bluetooth audio HAL V2
This bases on the new Bluetooth Audio HAL V2 to provide a HIDL based
interface for the stack. There will be a common interface named
BluetoothAudioClientInterface that the stack can register its session for
stream of A2DP or Hearing Aid. When the stack registers to this
pre-implemented BluetoothAudioClientInterface, the audio HAL can control
the stream state and the stack can report results to the audio HAL.
When running for software encoding, there will also data path via FMQ to
provide the bridge between audio HAL and the stack. This change contains
A2DP software encoding (legacy) only.
Bug:
111519504
Test: manual with A2DP software encoding (legacy)
Change-Id: Iac5a43c929d4036fa86e2b0c2c2920ca2b9dfa50
Joseph Pirozzo [Wed, 6 Feb 2019 21:10:24 +0000 (21:10 +0000)]
Merge "PBAP Client SDP record"
Martin Brabham [Fri, 1 Feb 2019 21:42:58 +0000 (13:42 -0800)]
Implement key attestation using AndroidKeystore.
Store SHA256 hash of the config file in an encrypted file that has been encrypted using the Android Keystore API.
Bug: b/
117993149
Test: Manual
Change-Id: I26de9ea05f515d6643a83d11628490fb49e10743
Cheney Ni [Tue, 5 Feb 2019 22:44:49 +0000 (14:44 -0800)]
Add generic audio HW module for Bluetooth audio HAL V2 am:
aef115f777 am:
bb067fe71d
am:
62941b0b7e
Change-Id: I1e39966586c8b83bca8c500a896ce11dbf560a25
Cheney Ni [Tue, 5 Feb 2019 22:41:11 +0000 (14:41 -0800)]
Add generic audio HW module for Bluetooth audio HAL V2 am:
aef115f777
am:
bb067fe71d
Change-Id: I8b12a96dbb361d850bd605eba394e88180379565
Cheney Ni [Tue, 5 Feb 2019 22:36:05 +0000 (14:36 -0800)]
Add generic audio HW module for Bluetooth audio HAL V2
am:
aef115f777
Change-Id: I05e5eeea39f01834ac490973047475d818b86a76
Cheney Ni [Wed, 7 Nov 2018 00:41:55 +0000 (08:41 +0800)]
Add generic audio HW module for Bluetooth audio HAL V2
This is loaded from audio HAL when initials the audio HW module,
bluetooth_audio, and uses Bluetooth audio HAL V2 to provide stream APIs
for control and data path. When the audio framework opens different
input or output streams, it uses the audio device type to choose which
SessionType is and pass to Bluetooth audio HAL so associates with the
Provider / Port pair and communicate with the Bluetooth stack.
* Audio contrl path uses IBluetoothAudioPort interface to interact with
the Bluetooth stack.
* Audio data path uses HIDL Fast Message Queue that is maintained within
IBluetoothAudioProvider HIDL and is ready after session started.
Bug:
111519504
Bug:
122503379
Test: manual
Change-Id: Ie668456179357c26397f5c6234ff46b5308dfe24
Hansong Zhang [Sat, 2 Feb 2019 08:21:52 +0000 (00:21 -0800)]
Merge changes from topic "am-
cdd47550-8877-443a-826f-
db2b25d750ce" into oc-dev am:
8ea254e227 am:
04f9bde9ea am:
a99a5f342a am:
812588ad71
am:
f1f97639ed
Change-Id: If158eb44e1597f66801cac8f67549be2ac80a334
Hansong Zhang [Sat, 2 Feb 2019 08:17:27 +0000 (00:17 -0800)]
Merge changes from topic "am-
cdd47550-8877-443a-826f-
db2b25d750ce" into oc-dev am:
8ea254e227 am:
04f9bde9ea am:
a99a5f342a
am:
812588ad71
Change-Id: Iee2d82f39de0c5bf5eb5eb846d88ca87feb12c95
Hansong Zhang [Sat, 2 Feb 2019 08:13:14 +0000 (00:13 -0800)]
Merge changes from topic "am-
cdd47550-8877-443a-826f-
db2b25d750ce" into oc-dev am:
8ea254e227 am:
04f9bde9ea
am:
a99a5f342a
Change-Id: I84c36724790660df845bb3a5ade56f792601ca0d
Hansong Zhang [Sat, 2 Feb 2019 08:09:09 +0000 (00:09 -0800)]
Merge changes from topic "am-
cdd47550-8877-443a-826f-
db2b25d750ce" into oc-dev am:
8ea254e227
am:
04f9bde9ea
Change-Id: I2f9ab4cc670a7faa7305fe110a964168bd4c40d5
Hansong Zhang [Sat, 2 Feb 2019 08:05:14 +0000 (00:05 -0800)]
Merge changes from topic "am-
cdd47550-8877-443a-826f-
db2b25d750ce" into oc-dev
am:
8ea254e227
Change-Id: Ifc5a20abe1c8091f4850cd3d75f9ecfb4474f11e
TreeHugger Robot [Sat, 2 Feb 2019 07:52:13 +0000 (07:52 +0000)]
Merge changes from topic "am-
cdd47550-8877-443a-826f-
db2b25d750ce" into oc-dev
* changes:
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am:
38f07a3c93 am:
14f6578d9e am:
53e323b2af am:
d0584f3dcf skipped:
55b702e6c4
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am:
38f07a3c93 am:
14f6578d9e am:
53e323b2af am:
d0584f3dcf
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am:
38f07a3c93 am:
14f6578d9e am:
53e323b2af
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am:
38f07a3c93 am:
14f6578d9e
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am:
38f07a3c93
DO NOT MERGE process_l2cap_cmd: Fix OOB
Hansong Zhang [Sat, 2 Feb 2019 04:58:12 +0000 (20:58 -0800)]
resolve merge conflicts of
ec78d74706c3e81f91eee53e3d9f959f66e5d77f to pi-dev am:
6c0f22f324
am:
35cfa7f0e3
Change-Id: I0c7ae0e569ac0792f5a46ab59b76ba59501a98d7
Hansong Zhang [Sat, 2 Feb 2019 04:54:07 +0000 (20:54 -0800)]
resolve merge conflicts of
ec78d74706c3e81f91eee53e3d9f959f66e5d77f to pi-dev
am:
6c0f22f324
Change-Id: Ic65233e9644f69567086a674b654f6a3b30b838e
Hansong Zhang [Sat, 2 Feb 2019 01:45:30 +0000 (17:45 -0800)]
resolve merge conflicts of
ec78d74706c3e81f91eee53e3d9f959f66e5d77f to pi-dev
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Id658b3485fdc0025bc44850be9f23bb2d2146d9b
Jack He [Fri, 1 Feb 2019 23:48:10 +0000 (15:48 -0800)]
Metrics: Add classic pairing metrics am:
16e6adb75b am:
d6479e3a78
am:
3b7c9348c7
Change-Id: Idba8bd83a65dc513c275812f54b830ab9a283bb2
Jack He [Fri, 1 Feb 2019 23:43:03 +0000 (15:43 -0800)]
Metrics: Add classic pairing metrics am:
16e6adb75b
am:
d6479e3a78
Change-Id: I3b14e5b204acaeb103fe21edd854416021e25298
Jack He [Fri, 1 Feb 2019 23:39:58 +0000 (15:39 -0800)]
Metrics: Add classic pairing metrics
am:
16e6adb75b
Change-Id: I79755761aa7236dda7b59791248b47a84bf111ad
Hansong Zhang [Fri, 1 Feb 2019 23:39:08 +0000 (15:39 -0800)]
Merge "process_l2cap_cmd: Fix OOB" into oc-dev am:
356edb4333
am:
82365b0e8d
Change-Id: I4f04fad60e84785f474390e473d2fcf19f66a044
Hansong Zhang [Fri, 1 Feb 2019 23:33:09 +0000 (15:33 -0800)]
Merge "process_l2cap_cmd: Fix OOB" into oc-dev
am:
356edb4333
Change-Id: I0e1800587513bdb39e0b6eff7e46254470ab2def
TreeHugger Robot [Fri, 1 Feb 2019 23:18:22 +0000 (23:18 +0000)]
Merge "process_l2cap_cmd: Fix OOB" into oc-dev
Jack He [Fri, 1 Feb 2019 01:44:46 +0000 (17:44 -0800)]
Metrics: Add classic pairing metrics
* Log HCI commands and events related to classic pairing
* Move all metrics logging for sending HCI command into a single
function
* Move all metrics logging for HCI command status into a single function
* Move all metrics logging for HCI Command complete into a single
function
* Move all metrics logging for HCI events into a single function
* Make sure we log all instances of HCI command sending methods,
including those with desinated callbacks
Bug:
112969790
Test: make, testdrive with statsd
Change-Id: I4b1ca4ee814096d84bcd93c8d7206b0a771a3210
Jack He [Fri, 1 Feb 2019 02:15:54 +0000 (18:15 -0800)]
Merge "Metrics: Log SMP pairing commands" am:
b11e36df28 am:
8c48ac2ccd
am:
0b2d003fe0
Change-Id: I43535971d4da1cddf1bd8636de20bb2f1cd74506
Jack He [Fri, 1 Feb 2019 02:11:49 +0000 (18:11 -0800)]
Merge "Metrics: Log SMP pairing commands" am:
b11e36df28
am:
8c48ac2ccd
Change-Id: I45d48dfda68c4ee6928b7bc1ea3731609406a072
Jack He [Fri, 1 Feb 2019 02:07:42 +0000 (18:07 -0800)]
Merge "Metrics: Log SMP pairing commands"
am:
b11e36df28
Change-Id: I7b20427bbec13e6a12cdc5a2a529480c9b6f5865
Treehugger Robot [Fri, 1 Feb 2019 01:57:35 +0000 (01:57 +0000)]
Merge "Metrics: Log SMP pairing commands"
Joseph Pirozzo [Thu, 17 Jan 2019 00:50:10 +0000 (16:50 -0800)]
PBAP Client SDP record
Add registration for PBAP Client SDP record when service is available.
Bug:
113505152
Test: Check SDP record via "sdptool browse"
Change-Id: I067eccbe0db17e32d0fc57ed57813fe1e63536d1
Jack He [Thu, 31 Jan 2019 23:17:08 +0000 (15:17 -0800)]
Metrics: Log SMP pairing commands
* Log SMP pairing commands and pairing failure reasons
Bug:
112969790
Test: make, testdrive with statsd
Change-Id: I51ae2af981a687954f7de3cee3caacce43d782b6
weichinweng [Thu, 31 Jan 2019 22:50:03 +0000 (14:50 -0800)]
Merge "Hearing Aid: Removes all registrations for connection when disconnect HA" am:
221072caf0 am:
2488345077
am:
9559073ee2
Change-Id: I421a5faf3112a0f95aeb716f8ea01cb8669ca983
weichinweng [Thu, 31 Jan 2019 22:35:00 +0000 (14:35 -0800)]
Merge "Hearing Aid: Removes all registrations for connection when disconnect HA" am:
221072caf0
am:
2488345077
Change-Id: Ia9730692af1c79afda93d208779fcd8bbde2323c
weichinweng [Thu, 31 Jan 2019 22:26:50 +0000 (14:26 -0800)]
Merge "Hearing Aid: Removes all registrations for connection when disconnect HA"
am:
221072caf0
Change-Id: I83875ebb05219a9453ba03d2abf6cfb3386a0bb4
Treehugger Robot [Thu, 31 Jan 2019 22:15:48 +0000 (22:15 +0000)]
Merge "Hearing Aid: Removes all registrations for connection when disconnect HA"
Jakub Pawlowski [Thu, 31 Jan 2019 22:01:09 +0000 (14:01 -0800)]
Fix race condition during LE device remove bond. am:
552dc5aa3f am:
fff4478b8d
am:
5762e88266
Change-Id: I17927830e4406a7e9b7a1aec556e607bec182f58
Jakub Pawlowski [Thu, 31 Jan 2019 21:49:20 +0000 (13:49 -0800)]
Fix race condition during LE device remove bond. am:
552dc5aa3f
am:
fff4478b8d
Change-Id: I0ac9068dc2a773d34a8a3bbca18a76dd9a4754c5
OSDN Git Service
