OSDN Git Service
Jakub Pawlowski [Tue, 11 Jul 2017 20:06:33 +0000 (20:06 +0000)]
Fix crashes on stack shutdown am:
864cb9d2db -s ours
am:
1a5f76213d -s ours
Change-Id: Iad4587a5619b2623376f751350d3bb92aaf2450c
Jakub Pawlowski [Tue, 11 Jul 2017 20:03:33 +0000 (20:03 +0000)]
Fix crashes on stack shutdown
am:
864cb9d2db -s ours
Change-Id: I5164357cda3907805cb48cf6fd3347c0ed1db41d
Jakub Pawlowski [Thu, 22 Jun 2017 19:45:30 +0000 (12:45 -0700)]
Fix crashes on stack shutdown
During stack shutdown, Unregister would sometimes get called after the
stack is already cleaned up, and the AdvertiseManager::Get would crash
on null check assertion. Ensure that stack is initialized before
Unregister call.
Bug:
37888261
Test: none
Change-Id: I7a4bbcd24ec7d24d21d04fe842985baaac899321
Merged-In: I7a4bbcd24ec7d24d21d04fe842985baaac899321
Tom Turney [Fri, 7 Jul 2017 21:29:42 +0000 (21:29 +0000)]
Merge "Revert "Blacklist Kinivo BTC350 for Absolute Volume"" into oc-dr1-dev am:
7e30dce07c
am:
f64d095ae8
Change-Id: I4d4a3c40fb8c94487f1cb2ac9c5c8542ca9c6dd9
Tom Turney [Fri, 7 Jul 2017 21:27:42 +0000 (21:27 +0000)]
Merge "Revert "Blacklist Kinivo BTC350 for Absolute Volume"" into oc-dr1-dev
am:
7e30dce07c
Change-Id: Ic44edb9e7a70144572f1a8866f39bc41b34e56ba
TreeHugger Robot [Fri, 7 Jul 2017 21:22:41 +0000 (21:22 +0000)]
Merge "Revert "Blacklist Kinivo BTC350 for Absolute Volume"" into oc-dr1-dev
Jinguang Dong [Fri, 7 Jul 2017 20:00:41 +0000 (20:00 +0000)]
Do not delete device record on HCI_ERR_KEY_MISSING am:
8a836291dc
am:
453a777585
Change-Id: I9d58080aaf433798b77d9b1f40c1e7a26f50edbf
Jinguang Dong [Fri, 7 Jul 2017 19:56:42 +0000 (19:56 +0000)]
Do not delete device record on HCI_ERR_KEY_MISSING
am:
8a836291dc
Change-Id: Ia26ee3594d1e608308b23e498caa5f47850de94c
Tom Turney [Fri, 7 Jul 2017 18:11:46 +0000 (18:11 +0000)]
Revert "Blacklist Kinivo BTC350 for Absolute Volume"
This reverts commit
84e8fa9b0873c31b6ee5dce53405db9e9ff77a31.
This is actually due to b/
63073544 not an issue with the device.
Change-Id: I8433adcfc7ff8f3bf8a16eccb72f0522fa896fef
Jinguang Dong [Wed, 28 Jun 2017 01:50:37 +0000 (09:50 +0800)]
Do not delete device record on HCI_ERR_KEY_MISSING
If an auth_complete event is received with HCI_ERR_KEY_MISSING, the
p_dev_rec->sm4 flag will be set to "BTM_SM4_UNKNOWN" in the
BTM_SecClearSecurityFlags() function. This will prevent the
BTM_SM4_RETRY procedure from being executed, which can cause
pairing failures.
To reproduce:
1. Two Phones, A: Android O, B: Android N.
2. Enable B in Bluetooth visable mode
3. A start discovery and create pairing with B successfully
4. B cancel pairing with A by remove A from pairing device
list of B.
5. A create paring with B again by touch paired device in A,
this first step will be failed.
Bug:
62615213
Test: manual
Change-Id: I514ba2f4d0fd2621c11bd83aeec24b8c6c6d2d5a
Signed-off-by: Yequan Song <songyequan@huawei.com>
(cherry picked from commit
549ec693c2a3a240a5b688a1311cc7c55daa59fc)
Android Build Merger (Role) [Fri, 7 Jul 2017 06:45:09 +0000 (06:45 +0000)]
Merge "Merge "Merge "Merge "Mark libbluetooth-types as vendor_available" am:
29f359181a am:
9ae297d02c" into oc-dev-plus-aosp am:
5562865e69" into oc-dr1-dev-plus-aosp am:
ef48ab23a1"
Android Build Merger (Role) [Fri, 7 Jul 2017 06:45:04 +0000 (06:45 +0000)]
Merge "Merge "Merge "Merge "Mark libbluetooth-types as vendor_available" am:
29f359181a am:
9ae297d02c" into oc-dev-plus-aosp am:
5562865e69" into oc-dr1-dev-plus-aosp am:
ef48ab23a1"
Jiyong Park [Fri, 7 Jul 2017 06:44:56 +0000 (06:44 +0000)]
Merge "Merge "Merge "Mark libbluetooth-types as vendor_available" am:
29f359181a am:
9ae297d02c" into oc-dev-plus-aosp am:
5562865e69" into oc-dr1-dev-plus-aosp
am:
ef48ab23a1
Change-Id: I4c2ba9402b6ba95e330378f0c88102234c3a2642
Jiyong Park [Fri, 7 Jul 2017 06:44:53 +0000 (06:44 +0000)]
Merge "Merge "Merge "Mark libbluetooth-types as vendor_available" am:
29f359181a am:
9ae297d02c" into oc-dev-plus-aosp am:
5562865e69" into oc-dr1-dev-plus-aosp
am:
ef48ab23a1
Change-Id: I0ebc697d87d6ae61ae63ea4fb0d47d65e2b262a5
Android Build Merger (Role) [Fri, 7 Jul 2017 06:44:50 +0000 (06:44 +0000)]
Merge "Merge "Merge "Mark libbluetooth-types as vendor_available" am:
29f359181a am:
9ae297d02c" into oc-dev-plus-aosp am:
5562865e69 am:
8f2112f623"
Jiyong Park [Fri, 7 Jul 2017 06:44:39 +0000 (06:44 +0000)]
Merge "Merge "Mark libbluetooth-types as vendor_available" am:
29f359181a am:
9ae297d02c" into oc-dev-plus-aosp am:
5562865e69
am:
8f2112f623
Change-Id: Ib8a90aa1564c54a5ba1a34cd277061ca456b6f8c
Jiyong Park [Fri, 7 Jul 2017 06:44:33 +0000 (06:44 +0000)]
Merge "Merge "Mark libbluetooth-types as vendor_available" am:
29f359181a am:
9ae297d02c" into oc-dev-plus-aosp am:
5562865e69
am:
8f2112f623
Change-Id: Ie5ea9660f0e753a2d67e32a82907be8340b39398
Jiyong Park [Fri, 7 Jul 2017 06:44:16 +0000 (06:44 +0000)]
Merge "Mark libbluetooth-types as vendor_available" am:
29f359181a am:
9ae297d02c am:
a081b71033
am:
835e033c12
Change-Id: I89bc75263e50000fc120cd9ba2205c89c874e0e5
Android Build Merger (Role) [Fri, 7 Jul 2017 06:41:17 +0000 (06:41 +0000)]
Merge "Merge "Merge "Mark libbluetooth-types as vendor_available" am:
29f359181a am:
9ae297d02c" into oc-dev-plus-aosp am:
5562865e69" into oc-dr1-dev-plus-aosp
Jiyong Park [Fri, 7 Jul 2017 06:41:08 +0000 (06:41 +0000)]
Merge "Merge "Mark libbluetooth-types as vendor_available" am:
29f359181a am:
9ae297d02c" into oc-dev-plus-aosp
am:
5562865e69
Change-Id: I8248c9bdb3967f41927766cd658fa35eef8f4dbb
Jiyong Park [Fri, 7 Jul 2017 06:41:04 +0000 (06:41 +0000)]
Merge "Merge "Mark libbluetooth-types as vendor_available" am:
29f359181a am:
9ae297d02c" into oc-dev-plus-aosp
am:
5562865e69
Change-Id: Ic65b0b4a8fe2e47cec599c24c1dfe3cb42814e3d
Jiyong Park [Fri, 7 Jul 2017 06:40:47 +0000 (06:40 +0000)]
Merge "Mark libbluetooth-types as vendor_available" am:
29f359181a am:
9ae297d02c
am:
a081b71033
Change-Id: Ib7882ffb5f0fd9e186a5127edfa3932a67450bfb
Android Build Merger (Role) [Fri, 7 Jul 2017 06:37:24 +0000 (06:37 +0000)]
Merge "Merge "Mark libbluetooth-types as vendor_available" am:
29f359181a am:
9ae297d02c" into oc-dev-plus-aosp
Jiyong Park [Fri, 7 Jul 2017 06:37:15 +0000 (06:37 +0000)]
Merge "Mark libbluetooth-types as vendor_available" am:
29f359181a
am:
9ae297d02c
Change-Id: Id9d7b0469261cde673a9d3206eb789f089967fd3
Jiyong Park [Fri, 7 Jul 2017 06:37:05 +0000 (06:37 +0000)]
Merge "Mark libbluetooth-types as vendor_available" am:
29f359181a
am:
9ae297d02c
Change-Id: I9257d4773e2e5b69ae21370e3b5b362967b9f123
Jiyong Park [Fri, 7 Jul 2017 06:33:15 +0000 (06:33 +0000)]
Merge "Mark libbluetooth-types as vendor_available"
am:
29f359181a
Change-Id: Ic63d5ccafceb91f2eddf3a41c8a3b8be6d200b0c
Treehugger Robot [Fri, 7 Jul 2017 06:27:41 +0000 (06:27 +0000)]
Merge "Mark libbluetooth-types as vendor_available"
Android Build Merger (Role) [Fri, 7 Jul 2017 06:14:53 +0000 (06:14 +0000)]
Merge "Do not delete device record on HCI_ERR_KEY_MISSING am:
549ec693c2 am:
b415ac8648 am:
009ffa8c7e am:
8429f9565c"
Jinguang Dong [Fri, 7 Jul 2017 06:14:44 +0000 (06:14 +0000)]
Do not delete device record on HCI_ERR_KEY_MISSING am:
549ec693c2 am:
b415ac8648 am:
009ffa8c7e
am:
8429f9565c
Change-Id: I2d579690ff8ad8dd423d197c0993add29336da30
Jinguang Dong [Fri, 7 Jul 2017 06:14:33 +0000 (06:14 +0000)]
Do not delete device record on HCI_ERR_KEY_MISSING am:
549ec693c2 am:
b415ac8648 am:
009ffa8c7e
am:
8429f9565c
Change-Id: I1e7a2c4a02edf5aa985e14c8a761195fb1fa18e6
Jinguang Dong [Fri, 7 Jul 2017 06:10:44 +0000 (06:10 +0000)]
Do not delete device record on HCI_ERR_KEY_MISSING am:
549ec693c2 am:
b415ac8648
am:
009ffa8c7e
Change-Id: I4e2e1e191c85f2bdb6ed559a6eec39ebed4be08f
Jinguang Dong [Fri, 7 Jul 2017 06:06:43 +0000 (06:06 +0000)]
Do not delete device record on HCI_ERR_KEY_MISSING am:
549ec693c2
am:
b415ac8648
Change-Id: I571bc39274f4f99663948789b323eba6c598b5f6
Jinguang Dong [Fri, 7 Jul 2017 06:02:43 +0000 (06:02 +0000)]
Do not delete device record on HCI_ERR_KEY_MISSING
am:
549ec693c2
Change-Id: I8c9ea5fad01fbb68b9f7067f7682cc9cd870daa2
Jinguang Dong [Wed, 28 Jun 2017 01:50:37 +0000 (09:50 +0800)]
Do not delete device record on HCI_ERR_KEY_MISSING
If an auth_complete event is received with HCI_ERR_KEY_MISSING, the
p_dev_rec->sm4 flag will be set to "BTM_SM4_UNKNOWN" in the
BTM_SecClearSecurityFlags() function. This will prevent the
BTM_SM4_RETRY procedure from being executed, which can cause
pairing failures.
To reproduce:
1. Two Phones, A: Android O, B: Android N.
2. Enable B in Bluetooth visable mode
3. A start discovery and create pairing with B successfully
4. B cancel pairing with A by remove A from pairing device
list of B.
5. A create paring with B again by touch paired device in A,
this first step will be failed.
Bug:
62615213
Test: manual
Change-Id: I514ba2f4d0fd2621c11bd83aeec24b8c6c6d2d5a
Signed-off-by: Yequan Song <songyequan@huawei.com>
Jiyong Park [Fri, 7 Jul 2017 04:29:16 +0000 (13:29 +0900)]
Mark libbluetooth-types as vendor_available
libbluetooty-types is used by a vendor module
android.hardware.bluetooth@1.0-service.sim, thus marking it as
vendor_available so that the lib is allowed for the HAL service when
building with BOARD_VNDK_VERSION.
Bug:
37342627
Test: BOARD_VNDK_VERSION=current m -j
android.hardware.bluetooth@1.0-service.sim
Change-Id: I39d071fc249ce6842e7175751abd6249b9367231
Android Build Merger (Role) [Fri, 7 Jul 2017 01:56:09 +0000 (01:56 +0000)]
Merge "Merge "Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours" into oc-dev-plus-aosp am:
e2dedfe267 -s ours" into oc-dr1-dev-plus-aosp am:
1bdb2d98c3 -s ours"
Android Build Merger (Role) [Fri, 7 Jul 2017 01:55:58 +0000 (01:55 +0000)]
Merge "Merge "Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours" into oc-dev-plus-aosp am:
e2dedfe267 -s ours" into oc-dr1-dev-plus-aosp am:
1bdb2d98c3 -s ours"
Jakub Pawlowski [Fri, 7 Jul 2017 01:55:58 +0000 (01:55 +0000)]
Merge "Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours" into oc-dev-plus-aosp am:
e2dedfe267 -s ours" into oc-dr1-dev-plus-aosp
am:
1bdb2d98c3 -s ours
Change-Id: I8d9792dd9473d74f1df0b8858ab746e86edffa12
Android Build Merger (Role) [Fri, 7 Jul 2017 01:55:52 +0000 (01:55 +0000)]
Merge "Merge "Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours" into oc-dev-plus-aosp am:
e2dedfe267 -s ours" into oc-dr1-dev-plus-aosp am:
6ad4a5eecd -s ours"
Jakub Pawlowski [Fri, 7 Jul 2017 01:55:46 +0000 (01:55 +0000)]
Merge "Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours" into oc-dev-plus-aosp am:
e2dedfe267 -s ours" into oc-dr1-dev-plus-aosp
am:
1bdb2d98c3 -s ours
Change-Id: I345325bca98f4137c5a34611a74282f187ce4292
Jakub Pawlowski [Fri, 7 Jul 2017 01:55:35 +0000 (01:55 +0000)]
Merge "Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours" into oc-dev-plus-aosp am:
e2dedfe267 -s ours" into oc-dr1-dev-plus-aosp
am:
6ad4a5eecd -s ours
Change-Id: I0b2e2071cc95d416d552be893a720bc93bc7f656
Android Build Merger (Role) [Fri, 7 Jul 2017 01:55:35 +0000 (01:55 +0000)]
Merge "Merge "Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours" into oc-dev-plus-aosp am:
e2dedfe267 -s ours" into oc-dr1-dev-plus-aosp am:
6ad4a5eecd -s ours"
Android Build Merger (Role) [Fri, 7 Jul 2017 01:55:29 +0000 (01:55 +0000)]
Merge "Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours am:
819ea67f58 -s ours" into oc-dr1-dev-plus-aosp am:
c2b70d10e8 -s ours"
Jakub Pawlowski [Fri, 7 Jul 2017 01:55:24 +0000 (01:55 +0000)]
Merge "Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours" into oc-dev-plus-aosp am:
e2dedfe267 -s ours" into oc-dr1-dev-plus-aosp
am:
6ad4a5eecd -s ours
Change-Id: I2c3de306cedd1a81b3ae4e19a659dc41f37eccf1
Jakub Pawlowski [Fri, 7 Jul 2017 01:55:17 +0000 (01:55 +0000)]
Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours am:
819ea67f58 -s ours" into oc-dr1-dev-plus-aosp
am:
c2b70d10e8 -s ours
Change-Id: I9ef91ee50b19b4c13dd5a9ffbe4192b83cbc1a99
Android Build Merger (Role) [Fri, 7 Jul 2017 01:55:15 +0000 (01:55 +0000)]
Merge "Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours am:
819ea67f58 -s ours" into oc-dr1-dev-plus-aosp am:
c2b70d10e8 -s ours"
Android Build Merger (Role) [Fri, 7 Jul 2017 01:55:11 +0000 (01:55 +0000)]
Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours am:
819ea67f58 -s ours am:
34e16ddf8a -s ours"
Jakub Pawlowski [Fri, 7 Jul 2017 01:55:03 +0000 (01:55 +0000)]
Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours am:
819ea67f58 -s ours" into oc-dr1-dev-plus-aosp
am:
c2b70d10e8 -s ours
Change-Id: I34ee602eda945894d9d8b30e3df6304a9671ed47
Jakub Pawlowski [Fri, 7 Jul 2017 01:55:00 +0000 (01:55 +0000)]
Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours am:
819ea67f58 -s ours
am:
34e16ddf8a -s ours
Change-Id: I54118a8475f77c45a8df74a9100c08faa52c0906
Android Build Merger (Role) [Fri, 7 Jul 2017 01:54:55 +0000 (01:54 +0000)]
Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours am:
819ea67f58 -s ours am:
34e16ddf8a -s ours"
Android Build Merger (Role) [Fri, 7 Jul 2017 01:54:53 +0000 (01:54 +0000)]
Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744 am:
56978c211d -s ours am:
8a5238a97a -s ours" into oc-dr1-dev-plus-aosp am:
089f330d1f -s ours"
Jakub Pawlowski [Fri, 7 Jul 2017 01:54:40 +0000 (01:54 +0000)]
Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours am:
819ea67f58 -s ours
am:
34e16ddf8a -s ours
Change-Id: Ic31bcfd7d875cdd306e8a5783b7216e74bb900f2
Jakub Pawlowski [Fri, 7 Jul 2017 01:54:32 +0000 (01:54 +0000)]
Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744 am:
56978c211d -s ours am:
8a5238a97a -s ours" into oc-dr1-dev-plus-aosp
am:
089f330d1f -s ours
Change-Id: I1f43863723d594aad626555585ceb54d0d39d411
Jakub Pawlowski [Fri, 7 Jul 2017 01:54:16 +0000 (01:54 +0000)]
Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744 am:
56978c211d -s ours am:
8a5238a97a -s ours" into oc-dr1-dev-plus-aosp
am:
089f330d1f -s ours
Change-Id: I387ba0c964a35609a544558b319b5bbb93c4312f
Android Build Merger (Role) [Fri, 7 Jul 2017 01:52:36 +0000 (01:52 +0000)]
Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744 am:
56978c211d -s ours am:
8a5238a97a -s ours am:
306a4f067e -s ours"
Android Build Merger (Role) [Fri, 7 Jul 2017 01:51:23 +0000 (01:51 +0000)]
Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744 am:
56978c211d -s ours am:
8a5238a97a -s ours am:
306a4f067e -s ours"
Jakub Pawlowski [Fri, 7 Jul 2017 01:51:06 +0000 (01:51 +0000)]
Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744 am:
56978c211d -s ours am:
8a5238a97a -s ours
am:
306a4f067e -s ours
Change-Id: Ifd0fc2caf7b9d97ec1af954429ab823af8330c35
Android Build Merger (Role) [Fri, 7 Jul 2017 01:50:06 +0000 (01:50 +0000)]
Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744 am:
56978c211d -s ours am:
8a5238a97a -s ours am:
b8bb258c50 -s ours"
Jakub Pawlowski [Fri, 7 Jul 2017 01:49:50 +0000 (01:49 +0000)]
Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744 am:
56978c211d -s ours am:
8a5238a97a -s ours
am:
306a4f067e -s ours
Change-Id: I20329c67c6c8940b327b0e79d1557a01baef1082
Android Build Merger (Role) [Fri, 7 Jul 2017 01:48:37 +0000 (01:48 +0000)]
Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744 am:
56978c211d -s ours am:
8a5238a97a -s ours am:
b8bb258c50 -s ours"
Jakub Pawlowski [Fri, 7 Jul 2017 01:48:27 +0000 (01:48 +0000)]
Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744 am:
56978c211d -s ours am:
8a5238a97a -s ours
am:
b8bb258c50 -s ours
Change-Id: Id7e9f1e81e0c9bf991696707023d217e0a196907
Android Build Merger (Role) [Fri, 7 Jul 2017 01:47:51 +0000 (01:47 +0000)]
Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744 am:
6ad7d19e69 am:
96481ffe75 am:
97ff06e212 -s ours"
Jakub Pawlowski [Fri, 7 Jul 2017 01:47:21 +0000 (01:47 +0000)]
Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744 am:
56978c211d -s ours am:
8a5238a97a -s ours
am:
b8bb258c50 -s ours
Change-Id: If9b84c31b19d7ea33acc56250b1f2ed3ad9fa5bf
Jakub Pawlowski [Fri, 7 Jul 2017 01:46:23 +0000 (01:46 +0000)]
Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744 am:
6ad7d19e69 am:
96481ffe75
am:
97ff06e212 -s ours
Change-Id: I4f79fbdcff341010677282c778b30ad71798f24e
Android Build Merger (Role) [Fri, 7 Jul 2017 01:45:55 +0000 (01:45 +0000)]
Merge "Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours" into oc-dev-plus-aosp am:
e2dedfe267 -s ours" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 7 Jul 2017 01:45:53 +0000 (01:45 +0000)]
Merge "Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours" into oc-dev-plus-aosp am:
e2dedfe267 -s ours" into oc-dr1-dev-plus-aosp
Jakub Pawlowski [Fri, 7 Jul 2017 01:45:46 +0000 (01:45 +0000)]
Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours" into oc-dev-plus-aosp
am:
e2dedfe267 -s ours
Change-Id: I57e407e09cf016d3e1c80b8ff23c906cd2f804d5
Jakub Pawlowski [Fri, 7 Jul 2017 01:45:45 +0000 (01:45 +0000)]
Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours" into oc-dev-plus-aosp
am:
e2dedfe267 -s ours
Change-Id: Ifc43f0dd2d2be6fd811d2e07ed78c2543b454d3f
Android Build Merger (Role) [Fri, 7 Jul 2017 01:45:39 +0000 (01:45 +0000)]
Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours am:
819ea67f58 -s ours" into oc-dr1-dev-plus-aosp
Jakub Pawlowski [Fri, 7 Jul 2017 01:45:31 +0000 (01:45 +0000)]
Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours
am:
819ea67f58 -s ours
Change-Id: I105d3635878c632c6f74e856cdd8191676e148a5
Jakub Pawlowski [Fri, 7 Jul 2017 01:45:30 +0000 (01:45 +0000)]
Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours
am:
819ea67f58 -s ours
Change-Id: I0a474b7c088dd21e5d4d48cdca036350c0bde000
Jakub Pawlowski [Fri, 7 Jul 2017 01:44:56 +0000 (01:44 +0000)]
Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744 am:
6ad7d19e69 am:
96481ffe75
am:
97ff06e212 -s ours
Change-Id: I93800860c5ca0035bc3241d93d5d5d09f2f9a204
Android Build Merger (Role) [Fri, 7 Jul 2017 01:44:28 +0000 (01:44 +0000)]
Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744 am:
56978c211d -s ours am:
8a5238a97a -s ours" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 7 Jul 2017 01:43:38 +0000 (01:43 +0000)]
Merge "Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master am:
4669be25d5 -s ours" into oc-dev-plus-aosp
Jakub Pawlowski [Fri, 7 Jul 2017 01:43:30 +0000 (01:43 +0000)]
Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744 am:
56978c211d -s ours
am:
8a5238a97a -s ours
Change-Id: I91ce9a209d77e13aef59d087a5e4910499f9e45a
Jakub Pawlowski [Fri, 7 Jul 2017 01:43:27 +0000 (01:43 +0000)]
Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master
am:
4669be25d5 -s ours
Change-Id: Ida9eb27eab54f87d9791dcb7108cb7351aec4fa2
Jakub Pawlowski [Fri, 7 Jul 2017 01:43:19 +0000 (01:43 +0000)]
Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744 am:
56978c211d -s ours
am:
8a5238a97a -s ours
Change-Id: Ib448b233562470db184826e5136e4d9dfde367c3
Jakub Pawlowski [Fri, 7 Jul 2017 01:43:19 +0000 (01:43 +0000)]
Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master
am:
4669be25d5 -s ours
Change-Id: Id8d611928dc23949ec94cf24ce5ec818e0df48b8
Jakub Pawlowski [Fri, 7 Jul 2017 01:41:18 +0000 (01:41 +0000)]
Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744 am:
6ad7d19e69
am:
96481ffe75
Change-Id: I2d8c1d2040f29c47e144a46d9f3ccc6ceb11edb0
Jakub Pawlowski [Fri, 7 Jul 2017 01:40:14 +0000 (01:40 +0000)]
Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744
am:
56978c211d -s ours
Change-Id: Ib77fc61181d7e8ee035a706e149868699a9decc1
Jakub Pawlowski [Fri, 7 Jul 2017 01:38:05 +0000 (01:38 +0000)]
Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744
am:
6ad7d19e69
Change-Id: I56c4b867de829c86dd4f742ac1fce01ce2951f4b
Android Build Merger (Role) [Fri, 7 Jul 2017 01:37:41 +0000 (01:37 +0000)]
Merge "Merge "Make RawAddress into a class (1/3)" am:
4a1fc85744" into stage-aosp-master
Jakub Pawlowski [Fri, 7 Jul 2017 01:36:41 +0000 (01:36 +0000)]
Merge "Make RawAddress into a class (1/3)"
am:
4a1fc85744
Change-Id: I61d249aa17044cd55b6834bc9563f648362621b6
Jakub Pawlowski [Fri, 7 Jul 2017 01:35:36 +0000 (01:35 +0000)]
Merge "Make RawAddress into a class (1/3)"
am:
4a1fc85744
Change-Id: I05b23ab3aff4d61dd8b04a3f011e832305203ce5
Treehugger Robot [Fri, 7 Jul 2017 01:29:30 +0000 (01:29 +0000)]
Merge "Make RawAddress into a class (1/3)"
Myles Watson [Fri, 7 Jul 2017 00:03:54 +0000 (00:03 +0000)]
Merge "Remove unused BDADDR definitions am:
525e743277" into stage-aosp-master am:
1b8043bbe0 am:
b88afe75f1
am:
0114df15b7
Change-Id: Idbc6c7b05339ed091baa5526beb128b7fe6f075c
Myles Watson [Fri, 7 Jul 2017 00:03:38 +0000 (00:03 +0000)]
Remove unused BDADDR definitions am:
525e743277 am:
799a72b7c2 am:
bc44e51f23
am:
42123550b3
Change-Id: I47324c4665ccb942fc0532a710164324b962bcf3
Philip Cuadra [Fri, 7 Jul 2017 00:03:22 +0000 (00:03 +0000)]
Bluetooth - Add tracing for TX queue and LDAC ABR am:
08beff46bc
am:
ef11915a58
Change-Id: I4986b7bc4bad1302e136b02387b25b8cbb0f7a3a
Myles Watson [Thu, 6 Jul 2017 23:33:35 +0000 (23:33 +0000)]
Merge "Remove unused BDADDR definitions am:
525e743277" into stage-aosp-master am:
1b8043bbe0
am:
b88afe75f1
Change-Id: I25f7a6e7f29e123cbceb386754c6a65e0b0d525e
Myles Watson [Thu, 6 Jul 2017 23:33:21 +0000 (23:33 +0000)]
Remove unused BDADDR definitions am:
525e743277 am:
799a72b7c2
am:
bc44e51f23
Change-Id: I5b1a055b24964f3da1efd816dbaae438b543b329
Philip Cuadra [Thu, 6 Jul 2017 23:30:45 +0000 (23:30 +0000)]
Bluetooth - Add tracing for TX queue and LDAC ABR
am:
08beff46bc
Change-Id: Icd60fb8123acb30279fc86df19c8dbb21ba7372b
Philip Cuadra [Fri, 9 Jun 2017 21:36:06 +0000 (14:36 -0700)]
Bluetooth - Add tracing for TX queue and LDAC ABR
For debugging, add tracing to show the length of the TX queue and the
LDAC ABR level.
Test: Ran bluetooth, took a systrace
Change-Id: Ia23764d68f27ae8209e37c4a0836852d73cf6cbc
Myles Watson [Thu, 6 Jul 2017 23:09:42 +0000 (23:09 +0000)]
Merge "Remove unused BDADDR definitions am:
525e743277" into stage-aosp-master
am:
1b8043bbe0
Change-Id: I74ab0fb68ea45e31ab517a553d98e612c40b47ff
Myles Watson [Thu, 6 Jul 2017 23:09:26 +0000 (23:09 +0000)]
Remove unused BDADDR definitions am:
525e743277
am:
799a72b7c2
Change-Id: Id08c1c926e2ff224d44a5cdd72f75c1391347e89
Android Build Merger (Role) [Thu, 6 Jul 2017 22:56:40 +0000 (22:56 +0000)]
Merge "Remove unused BDADDR definitions am:
525e743277" into stage-aosp-master
Myles Watson [Thu, 6 Jul 2017 22:56:19 +0000 (22:56 +0000)]
Remove unused BDADDR definitions
am:
525e743277
Change-Id: I211d82d42a53fe9bb2a6b930c7d99d5187b4f850
Myles Watson [Thu, 6 Jul 2017 22:56:14 +0000 (22:56 +0000)]
Remove unused BDADDR definitions
am:
525e743277
Change-Id: I13b1c9dd558bf8662f5f9af0008df0740ec333ae
Jakub Pawlowski [Mon, 3 Jul 2017 22:39:36 +0000 (15:39 -0700)]
Make RawAddress into a class (1/3)
* Add libbluetooth-types - library containing types implementation, that
is common between stystem/bt and packages/apps/Bluetooth. It must be
included in every project using btif interface.
* Put Raw Address implementation into libbluetooth-types
* Unify all "to/from string" helper methods into ToString and FromString
* bd_addr_empty -> RawAddress::kEmpty
* bd_addr_any -> RawAddress::kAny
Also fix leaks in jni str2addr by adding ReleaseStringUTFChars
Test: types_unittest
Change-Id: Ie0694843ad5fbd2a80b310c5f532e5e5a9548043
Merged-In: Ie0694843ad5fbd2a80b310c5f532e5e5a9548043
Jakub Pawlowski [Mon, 3 Jul 2017 22:39:36 +0000 (15:39 -0700)]
Make RawAddress into a class (1/3)
* Add libbluetooth-types - library containing types implementation, that
is common between stystem/bt and packages/apps/Bluetooth. It must be
included in every project using btif interface.
* Put Raw Address implementation into libbluetooth-types
* Unify all "to/from string" helper methods into ToString and FromString
* bd_addr_empty -> RawAddress::kEmpty
* bd_addr_any -> RawAddress::kAny
Also fix leaks in jni str2addr by adding ReleaseStringUTFChars
Test: types_unittest
Change-Id: Ie0694843ad5fbd2a80b310c5f532e5e5a9548043
Srinu Jella [Thu, 6 Jul 2017 20:36:42 +0000 (20:36 +0000)]
Don't initiate role switch for blacklisted devices am:
b47bf4e5ae -s ours
am:
4962a67b2b -s ours
Change-Id: I1fa57a6c87635319cf43c21485766b53260e665e
OSDN Git Service
