OSDN Git Service
Arman Uguray [Thu, 24 Sep 2015 07:07:53 +0000 (07:07 +0000)]
am
b932fa6a: am
2fea18e5: service: Add missing include
* commit '
b932fa6a95ca6153ecc327d47ee7bdf1477c52bd':
service: Add missing include
Arman Uguray [Thu, 24 Sep 2015 06:58:58 +0000 (06:58 +0000)]
am
2fea18e5: service: Add missing include
* commit '
2fea18e501ab98df3254a08fca981513bf098274':
service: Add missing include
Arman Uguray [Thu, 24 Sep 2015 06:43:18 +0000 (23:43 -0700)]
service: Add missing include
Added missing "#include <atomic>" line to fix build breakages on
some build flavors.
Change-Id: I611bb63e84787217ff4bf774ceebc09ffd3c0476
Arman Uguray [Thu, 24 Sep 2015 02:25:02 +0000 (02:25 +0000)]
am
5114b153: am
d19bc045: service/client: Add start-adv and stop-adv
* commit '
5114b1534f43b5fdb6c76d3647f0fda286fab7a5':
service/client: Add start-adv and stop-adv
Arman Uguray [Thu, 24 Sep 2015 02:25:01 +0000 (02:25 +0000)]
am
ff71fd25: am
1a3e9aba: service: Implement IBluetoothLowEnergy advertising
* commit '
ff71fd2587969e1092b68f6717733102c7e0ed5b':
service: Implement IBluetoothLowEnergy advertising
Arman Uguray [Thu, 24 Sep 2015 02:25:00 +0000 (02:25 +0000)]
am
8eb36de9: am
12338405: service: Add advertising support to LowEnergyClient
* commit '
8eb36de9498f83aa12b9bc9437ae38e0b94758fd':
service: Add advertising support to LowEnergyClient
Arman Uguray [Thu, 24 Sep 2015 02:24:58 +0000 (02:24 +0000)]
am
f8a50285: am
b2b1ecd3: service: Fix bug in RemoteCallbackMap
* commit '
f8a50285a436f6c8b9db988cdd290f4a2aa814a1':
service: Fix bug in RemoteCallbackMap
Arman Uguray [Thu, 24 Sep 2015 02:24:56 +0000 (02:24 +0000)]
am
fec4ae27: am
909b7e66: service: Add various LE advertising constants
* commit '
fec4ae2760aa9d6322bd98b0d39379c447355778':
service: Add various LE advertising constants
Arman Uguray [Thu, 24 Sep 2015 02:15:36 +0000 (02:15 +0000)]
am
d19bc045: service/client: Add start-adv and stop-adv
* commit '
d19bc0457a9b6519acd6a79c3ac7de653894f5ec':
service/client: Add start-adv and stop-adv
Arman Uguray [Thu, 24 Sep 2015 02:15:36 +0000 (02:15 +0000)]
am
1a3e9aba: service: Implement IBluetoothLowEnergy advertising
* commit '
1a3e9aba73551eeecdfeece04f1c39a00880d56c':
service: Implement IBluetoothLowEnergy advertising
Arman Uguray [Thu, 24 Sep 2015 02:15:35 +0000 (02:15 +0000)]
am
12338405: service: Add advertising support to LowEnergyClient
* commit '
12338405e0d8d70573e650560ccc8e1ce7d8e8cd':
service: Add advertising support to LowEnergyClient
Arman Uguray [Thu, 24 Sep 2015 02:15:34 +0000 (02:15 +0000)]
am
b2b1ecd3: service: Fix bug in RemoteCallbackMap
* commit '
b2b1ecd3c282412773f5ca70ee2798542bc2920f':
service: Fix bug in RemoteCallbackMap
Arman Uguray [Thu, 24 Sep 2015 02:15:33 +0000 (02:15 +0000)]
am
909b7e66: service: Add various LE advertising constants
* commit '
909b7e6681101eb5e2d56209993134932284b50e':
service: Add various LE advertising constants
Arman Uguray [Thu, 17 Sep 2015 01:04:32 +0000 (18:04 -0700)]
service/client: Add start-adv and stop-adv
Added the start-adv and stop-adv commands to FCLI for testing
the IBluetoothLowEnergy advertising APIs.
Bug:
23793954
Change-Id: I023441e4db4a50608b4f9a90bf3365c1dab8d0d1
Arman Uguray [Thu, 17 Sep 2015 01:02:31 +0000 (18:02 -0700)]
service: Implement IBluetoothLowEnergy advertising
This CL implements the IBluetoothLowEnergy Binder APIs for
multi-advertising.
Bug:
23793954
Change-Id: I6519f86b9e528d23d2c1f46618188d1123686856
Arman Uguray [Thu, 17 Sep 2015 01:00:05 +0000 (18:00 -0700)]
service: Add advertising support to LowEnergyClient
This CL adds the StartAdvertising and StopAdvertising APIs to
LowEnergyClient. These internally call into the multi-advertising
APIs in HAL and report success or failure in an async callback.
The sequence of calls to enable advertising and setting advertising
and scan response data are serialized internally.
Bug:
23793954
Change-Id: Id093a98f3baca6328653b986857a064e8a722690
Arman Uguray [Thu, 17 Sep 2015 00:56:32 +0000 (17:56 -0700)]
service: Fix bug in RemoteCallbackMap
Fixed a bug in RemoteCallbackMap that returned the wrong value
in one of the template functions that wasn't exercised before.
Bug:
23793954
Change-Id: Id6848bd08e6941d3c8c6d6e4d6e494a0b9dc4c69
Arman Uguray [Thu, 17 Sep 2015 00:55:04 +0000 (17:55 -0700)]
service: Add various LE advertising constants
Added several constants that are used in LE advertising. Added
constants for the exposed EIR fields here as well so that clients
can use it.
Bug:
23793954
Change-Id: Ib6a97d6beb1a31c9c3ea7ed468167dab627d7d32
Andy Hung [Tue, 22 Sep 2015 18:47:04 +0000 (18:47 +0000)]
am
775302e0: am
28209191: Merge "DO NOT MERGE - A2DP audio HAL: implement out_get_presentation_position()" into mnc-dr-dev
* commit '
775302e0b38b912c9ff15862ff62aabb20b6dab6':
DO NOT MERGE - A2DP audio HAL: implement out_get_presentation_position()
Andy Hung [Tue, 22 Sep 2015 18:31:20 +0000 (18:31 +0000)]
am
28209191: Merge "DO NOT MERGE - A2DP audio HAL: implement out_get_presentation_position()" into mnc-dr-dev
* commit '
282091913b4ee3b26a2f79a630ecdca4e8ca89f6':
DO NOT MERGE - A2DP audio HAL: implement out_get_presentation_position()
Andy Hung [Tue, 22 Sep 2015 18:26:32 +0000 (18:26 +0000)]
Merge "DO NOT MERGE - A2DP audio HAL: implement out_get_presentation_position()" into mnc-dr-dev
Pankaj Kanwar [Tue, 22 Sep 2015 17:01:07 +0000 (17:01 +0000)]
am
5e4b08a3: am
81d4127c: Merge "Check BR device count before initiating role switch" into mnc-dr-dev
* commit '
5e4b08a3efc3e87ea09e5b8794807df06c30fa7b':
Check BR device count before initiating role switch
Pankaj Kanwar [Tue, 22 Sep 2015 16:43:14 +0000 (16:43 +0000)]
am
81d4127c: Merge "Check BR device count before initiating role switch" into mnc-dr-dev
* commit '
81d4127c5bd2c0bd2ac50a1a7a9f24ad8148434d':
Check BR device count before initiating role switch
Pankaj Kanwar [Tue, 22 Sep 2015 16:37:36 +0000 (16:37 +0000)]
Merge "Check BR device count before initiating role switch" into mnc-dr-dev
tturney [Mon, 21 Sep 2015 22:07:13 +0000 (22:07 +0000)]
am
a2c2a1b3: am
e31d4171: Fix PAN and AV role switch war
* commit '
a2c2a1b34cc7290ab6f327714d08d13f34753244':
Fix PAN and AV role switch war
tturney [Mon, 21 Sep 2015 21:51:19 +0000 (21:51 +0000)]
am
e31d4171: Fix PAN and AV role switch war
* commit '
e31d417196a377d6718cbccd54794097e095d0b1':
Fix PAN and AV role switch war
tturney [Mon, 21 Sep 2015 17:49:09 +0000 (10:49 -0700)]
Fix PAN and AV role switch war
Bug:
23740164
Change-Id: Ib26a64b624c711443201adc4fde6b041ecb0dde1
Arman Uguray [Sun, 20 Sep 2015 22:10:48 +0000 (22:10 +0000)]
am
c1f12e98: am
27650cd8: service: Fix build breakage.
* commit '
c1f12e9875c4ec2e28007bfbb0dab826d83253b7':
service: Fix build breakage.
Arman Uguray [Sun, 20 Sep 2015 22:10:47 +0000 (22:10 +0000)]
am
fe042443: am
d1ed1f53: service: Add HAL wrappers for multi-advertising
* commit '
fe0424430679ef4e782525335420ccfdf59ba227':
service: Add HAL wrappers for multi-advertising
Arman Uguray [Sun, 20 Sep 2015 19:31:22 +0000 (19:31 +0000)]
am
27650cd8: service: Fix build breakage.
* commit '
27650cd8f2473356351f3279177486971a0f9054':
service: Fix build breakage.
Arman Uguray [Sun, 20 Sep 2015 19:26:16 +0000 (12:26 -0700)]
service: Fix build breakage.
Fixed build breakage due to missing changes.
Change-Id: Iac962fef2e9be979a2af90a43a66a5c66bbe4ad4
Arman Uguray [Sun, 20 Sep 2015 19:21:54 +0000 (19:21 +0000)]
am
d1ed1f53: service: Add HAL wrappers for multi-advertising
* commit '
d1ed1f53a5c0cce5ecb8d784acf5bef53211a20f':
service: Add HAL wrappers for multi-advertising
Arman Uguray [Thu, 17 Sep 2015 00:53:05 +0000 (17:53 -0700)]
service: Add HAL wrappers for multi-advertising
This CL adds the fake and real HAL wrappers for the multi-advertising
APIs in hardware/bluetooth/bt_gatt_client.h.
Bug:
23793954
Change-Id: I485e7cf87c4b6f42c3a702c62230a287443a75c1
Andre Eisenbach [Sat, 19 Sep 2015 16:21:31 +0000 (16:21 +0000)]
am
f628dbdf: am
1cf812f6: Ensure thread priority is raised for media task / UIPC
* commit '
f628dbdfe1ac6e4de0a93c35cf43156af834bf8e':
Ensure thread priority is raised for media task / UIPC
Andre Eisenbach [Sat, 19 Sep 2015 16:21:30 +0000 (16:21 +0000)]
am
c7cb8f07: am
ef7d8cb8: Change UHID socket to be non-blocking
* commit '
c7cb8f0715263404ab78f864933567e5e870ab49':
Change UHID socket to be non-blocking
Andre Eisenbach [Sat, 19 Sep 2015 16:07:40 +0000 (16:07 +0000)]
am
1cf812f6: Ensure thread priority is raised for media task / UIPC
* commit '
1cf812f61823c981406f18b2577f43b69e80253d':
Ensure thread priority is raised for media task / UIPC
Andre Eisenbach [Sat, 19 Sep 2015 16:07:40 +0000 (16:07 +0000)]
am
ef7d8cb8: Change UHID socket to be non-blocking
* commit '
ef7d8cb8b012e77c9b0c596c5ad4b0ffb7e5dde9':
Change UHID socket to be non-blocking
Andre Eisenbach [Sat, 19 Sep 2015 03:13:53 +0000 (20:13 -0700)]
Ensure thread priority is raised for media task / UIPC
Bug:
23978964
Change-Id: I36b6d05bb82eb0283eed3b465038d65890c4c245
Arman Uguray [Fri, 18 Sep 2015 02:18:29 +0000 (02:18 +0000)]
am
5f5d1e54: am
52bfc606: service: Add binder stubs for advertising API
* commit '
5f5d1e545ac5db670ee3404a031ba11d79fb53e8':
service: Add binder stubs for advertising API
Arman Uguray [Fri, 18 Sep 2015 02:18:29 +0000 (02:18 +0000)]
am
b3234cf1: am
3d73f617: service: Add AdvertiseData and AdvertiseSettings
* commit '
b3234cf14c10ff0f72458013ab5f4df28aff4bd6':
service: Add AdvertiseData and AdvertiseSettings
Arman Uguray [Fri, 18 Sep 2015 02:09:00 +0000 (02:09 +0000)]
am
52bfc606: service: Add binder stubs for advertising API
* commit '
52bfc6060cec652a67c8989e0548225af0008be1':
service: Add binder stubs for advertising API
Arman Uguray [Fri, 18 Sep 2015 02:08:59 +0000 (02:08 +0000)]
am
3d73f617: service: Add AdvertiseData and AdvertiseSettings
* commit '
3d73f617610de09a68243852c91a2fffcabc367c':
service: Add AdvertiseData and AdvertiseSettings
Arman Uguray [Thu, 10 Sep 2015 21:28:54 +0000 (14:28 -0700)]
service: Add binder stubs for advertising API
Added native binder proxy stubs for IBluetoothLowEnergy interface
startMultiAdvertising and stopMultiAdvertising methods and
IBluetoothLowEnergyCallback.onMultiAdvertiseCallback.
Bug:
23793954
Change-Id: I0577619502042f612bf17f2a0affb2a9a1eaed38
Arman Uguray [Mon, 31 Aug 2015 21:31:02 +0000 (14:31 -0700)]
service: Add AdvertiseData and AdvertiseSettings
Added native definitions for AdvertiseData and AdvertiseSettings
framework objects. Also introduced parcel_helpers, which currently
provides functions to convert AdvertiseData and AdvertiseSettings
to/from Parcel.
As part of this, the bt_service_binder_unittests executable has been
added. This is built for the target device rather than host, as it
requires libbinder and libbinder currently can't be built for host.
Bug:
23793954
Change-Id: Ic55d7f48579e519006decaada5b6f2ef7aefe595
Arman Uguray [Fri, 18 Sep 2015 00:00:18 +0000 (00:00 +0000)]
am
e78161ae: am
2e434148: service/client: Add first BLE interface commands
* commit '
e78161ae439db5577fca6accb857e7e996fa91fd':
service/client: Add first BLE interface commands
Arman Uguray [Thu, 17 Sep 2015 23:54:28 +0000 (23:54 +0000)]
am
2e434148: service/client: Add first BLE interface commands
* commit '
2e4341488064be7e8f4d575c8de0a1670ddc81a0':
service/client: Add first BLE interface commands
Arman Uguray [Thu, 17 Sep 2015 23:50:32 +0000 (23:50 +0000)]
am
f35612aa: am
15cf17fc: service: Implement IBluetoothLowEnergy client registration
* commit '
f35612aad0f1de5f480cc48a4df7332276f994d0':
service: Implement IBluetoothLowEnergy client registration
Arman Uguray [Thu, 17 Sep 2015 23:50:31 +0000 (23:50 +0000)]
am
38ddd10b: am
f8711f2e: service: Added RemoteCallbackMap
* commit '
38ddd10ba4d5126f52ae7d4b83306f029602e623':
service: Added RemoteCallbackMap
Arman Uguray [Thu, 17 Sep 2015 23:50:30 +0000 (23:50 +0000)]
am
889cc102: am
81f82d27: service: Add IBluetoothLowEnergy interface
* commit '
889cc1026fe680747df8a4ef650de44c3fd8b563':
service: Add IBluetoothLowEnergy interface
Arman Uguray [Thu, 17 Sep 2015 23:47:23 +0000 (23:47 +0000)]
am
15cf17fc: service: Implement IBluetoothLowEnergy client registration
* commit '
15cf17fc406f7796b33dc56585eccbcd1c9c6df9':
service: Implement IBluetoothLowEnergy client registration
Arman Uguray [Thu, 17 Sep 2015 23:47:22 +0000 (23:47 +0000)]
am
f8711f2e: service: Added RemoteCallbackMap
* commit '
f8711f2e95343f2c9673ab4ffc0bebbdba16c452':
service: Added RemoteCallbackMap
Arman Uguray [Thu, 17 Sep 2015 23:43:28 +0000 (23:43 +0000)]
am
81f82d27: service: Add IBluetoothLowEnergy interface
* commit '
81f82d278f4d5593012357857c5bc1d0cd758c82':
service: Add IBluetoothLowEnergy interface
Arman Uguray [Fri, 4 Sep 2015 20:17:39 +0000 (13:17 -0700)]
service/client: Add first BLE interface commands
Added the register-ble, unregister-ble, and unregister-all-ble
commands to FCLI. Also added a DeathListener for the IBluetooth
interface to handle the case when bluetoothtbd dies.
Bug:
23793954
Change-Id: I3c549ea59665cf174fb47114b879f679c0aafcb4
Arman Uguray [Fri, 4 Sep 2015 20:11:39 +0000 (13:11 -0700)]
service: Implement IBluetoothLowEnergy client registration
This CL adds support for the IBluetoothLowEnergy registerClient and
unregisterClient methods. A lot of the code added here deals with
asynchronous callback registration and can be generalized to other
interfaces that asynchronously associate and return client
interface IDs with callback binders.
Bug:
23793954
Change-Id: I82cf26e194c456f04363fe66f094bc803a5aa436
Arman Uguray [Fri, 4 Sep 2015 19:57:37 +0000 (12:57 -0700)]
service: Added RemoteCallbackMap
Added the RemoteCallbackMap template class which allows storing
IInterface subclasses in an associative array while tracking the
death of the remote process that owns the associated binder. This is
similar to RemoteCallbackList but stores entries in key-value pairs.
Also fixed some RemoteCallbackList documentation and change the code to
use std::unordered_map rather than std::map.
Bug:
23793954
Change-Id: I205c0491d21fef3bc5eeb5c4a7356dab4b6eb8dc
Arman Uguray [Wed, 2 Sep 2015 00:22:29 +0000 (17:22 -0700)]
service: Add IBluetoothLowEnergy interface
Introduce the IBluetoothLowEnergy and IBluetoothLowEnergyCallback
interfaces with stub implementations for three methods only. Added
the definition and implementation for IBluetooth.GetLowEnergyInterface.
Bug:
23395353
Change-Id: Iba4d9aa20779956b486c0b46e752e0e00be3aeea
Andre Eisenbach [Thu, 17 Sep 2015 22:16:20 +0000 (15:16 -0700)]
Change UHID socket to be non-blocking
On some platforms, the logs indicate that the BTU task is stalled by
UHID driver when writing the HID descriptor to the kernel. This patch
converts the UHID socket to non-blocking to avoid stalling the main
BTU task.
Bug:
23978964
Change-Id: I5a7a3e106fb2c967d68f077faedcd4fe62bbd912
Nitin Shivpure [Wed, 12 Aug 2015 12:45:11 +0000 (18:15 +0530)]
Check BR device count before initiating role switch
A case where DUT is acting as PANU device on BR/EDR link & also
acting as central on LE link. As LE link & PANU link need not to
be master & it's not a scatter-net scenario, because there is only
a BR link. So checking for BR device count before initiating role
switch to avoid continuous loop of role switches.
Cherry-picked from: https://partner-android-review.googlesource.com/#/c/376058/
Change-Id: I70e4041a71ba965f1f9e25729c3cfd20ae03d6b4
Bug:
23290136
Arman Uguray [Thu, 17 Sep 2015 02:02:36 +0000 (02:02 +0000)]
am
d7b31304: am
c2fc0f28: service: Introduce bluetooth::LowEnergyClient
* commit '
d7b313043c124383075f9c89e2a94ca266524f91':
service: Introduce bluetooth::LowEnergyClient
Arman Uguray [Thu, 17 Sep 2015 01:55:07 +0000 (01:55 +0000)]
am
c2fc0f28: service: Introduce bluetooth::LowEnergyClient
* commit '
c2fc0f287f4dfaf206a51856b8d5dfa923af3c05':
service: Introduce bluetooth::LowEnergyClient
Arman Uguray [Thu, 3 Sep 2015 22:09:41 +0000 (15:09 -0700)]
service: Introduce bluetooth::LowEnergyClient
Added the LowEnergyClient class which manages a per-application BLE
API client instance. This currently only supports getting registered
with the stack and obtaining a client_if handle but will expose APIs
in the future for various BLE operations.
Bug:
23793954
Change-Id: I423f6d12321877826525e5e52136682fa9d5a441
Eric Laurent [Tue, 26 May 2015 22:50:29 +0000 (15:50 -0700)]
DO NOT MERGE - A2DP audio HAL: implement out_get_presentation_position()
And complete implementation of out_get_render_position()
Bug:
21199150
Bug:
24042067
Change-Id: I95038ad68433e401b096a0159282a2ae372570e1
Sharvil Nanavati [Tue, 15 Sep 2015 05:11:51 +0000 (22:11 -0700)]
Fix build: use unsigned long long in arithmetic expression.
Change-Id: Ibaa407cc7456969b177cf4c2038f90b388707786
Sharvil Nanavati [Tue, 15 Sep 2015 04:47:53 +0000 (21:47 -0700)]
Fix build: add LOG_TAG parameter to LOG_* macros.
Change-Id: I455fdde6264cd17cd2b73dbd1f70c68e7d632ec7
Sharvil Nanavati [Tue, 15 Sep 2015 04:21:24 +0000 (21:21 -0700)]
resolved conflicts for
b8cc54d1 to mnc-dr-dev-plus-aosp
Change-Id: I157c86604ccaf0635bdf9a132145af3552407cd0
Arman Uguray [Mon, 14 Sep 2015 21:20:23 +0000 (21:20 +0000)]
am
21d6dc21: am
e9c82dca: service: Add UUID::GetRandom
* commit '
21d6dc2100ac14455092972abca3a7ec5a3343db':
service: Add UUID::GetRandom
Arman Uguray [Mon, 14 Sep 2015 21:20:22 +0000 (21:20 +0000)]
am
ae789289: am
9ded7b61: service: Add hal::BluetoothGattInterface
* commit '
ae78928948557558437b006bbeaa65b6e5988be8':
service: Add hal::BluetoothGattInterface
Arman Uguray [Mon, 14 Sep 2015 21:14:32 +0000 (21:14 +0000)]
am
e9c82dca: service: Add UUID::GetRandom
* commit '
e9c82dca471da42c5a5dddb4582b70b3681758af':
service: Add UUID::GetRandom
Arman Uguray [Mon, 14 Sep 2015 21:14:32 +0000 (21:14 +0000)]
am
9ded7b61: service: Add hal::BluetoothGattInterface
* commit '
9ded7b6175825afdac0e2cebef8755e4d7b03103':
service: Add hal::BluetoothGattInterface
Arman Uguray [Thu, 3 Sep 2015 22:00:52 +0000 (15:00 -0700)]
service: Add UUID::GetRandom
Added a static class method to UUID that returns a random 128-bit UUID.
Also converted the enum constants to pure integer constants to make
their meaning more explicit.
Bug:
23395353
Change-Id: If8b97d40c020fdfc8b460b537b2da7c62b0c24ad
Arman Uguray [Mon, 31 Aug 2015 23:29:07 +0000 (16:29 -0700)]
service: Add hal::BluetoothGattInterface
Added hal::BluetoothGattInterface which is a C++ wrapper around the
HAL Bluetooth GATT interfaces. This follows the current pattern of hal/*
wrappers and is meant to be fakeable.
Bug:
23395353
Change-Id: Ib11afba9fe2f4632591d5db384edf32ca788bf2c
Sharvil Nanavati [Mon, 7 Sep 2015 08:05:19 +0000 (01:05 -0700)]
DO NOT MERGE Use POSIX timer API for wake alarms instead of OSI callouts.
This change increases RFCOMM throughput by a little over 50%. We
were paying a pretty major cost in setting up / tearing down wake
timers by going through JNI and Binder over to AlarmService.
There are a few gotchas with this implementation, particularly
because the Linux kernel implementation of wake timers is somewhat
buggy.
Bug:
23375670
Change-Id: I27558f439e57696d912b968f56a48e5e4098860b
Sharvil Nanavati [Wed, 9 Sep 2015 22:56:17 +0000 (15:56 -0700)]
Add libpower as a dependency to all device targets that include libosi.
Bug:
23902077
Change-Id: Icc7119a2b3199310e2210d46f599da00261fdff6
Bart Sears [Thu, 10 Sep 2015 00:11:40 +0000 (00:11 +0000)]
Revert "Add libpower to all build targets that depend on libosi."
This reverts commit
5997f91a5224ac6072eff11c89b7b9658d3d7df0.
Change-Id: If682757bca55ecc0057bdd058b654ecbdcc7e50a
Sharvil Nanavati [Wed, 9 Sep 2015 22:23:56 +0000 (15:23 -0700)]
Add libpower to all build targets that depend on libosi.
Change-Id: I26e8b27077a6bd016198b90c5aabb2b2d7cdcaa2
Andre Eisenbach [Wed, 9 Sep 2015 18:31:39 +0000 (18:31 +0000)]
am
043257b2: am
03ca1894: Merge "Allow BT inquiry while discovery is in progress." into mnc-dr-dev
* commit '
043257b2ab96b07ba24e97dc6031536f8edba075':
Allow BT inquiry while discovery is in progress.
Andre Eisenbach [Wed, 9 Sep 2015 18:19:23 +0000 (18:19 +0000)]
am
1a2053f0: am
313a933e: Merge "Eliminate recursive calling when handling GATT related errors" into mnc-dr-dev
* commit '
1a2053f0fff145a6437261581c361048b328b2b4':
Eliminate recursive calling when handling GATT related errors
Andre Eisenbach [Wed, 9 Sep 2015 18:15:41 +0000 (18:15 +0000)]
am
03ca1894: Merge "Allow BT inquiry while discovery is in progress." into mnc-dr-dev
* commit '
03ca189412e3f8ec7c5963339af172c9276b3b9b':
Allow BT inquiry while discovery is in progress.
Andre Eisenbach [Wed, 9 Sep 2015 18:10:57 +0000 (18:10 +0000)]
Merge "Allow BT inquiry while discovery is in progress." into mnc-dr-dev
Andre Eisenbach [Wed, 9 Sep 2015 18:04:33 +0000 (18:04 +0000)]
am
313a933e: Merge "Eliminate recursive calling when handling GATT related errors" into mnc-dr-dev
* commit '
313a933ef3f55ad5121ff70851718b812cf05135':
Eliminate recursive calling when handling GATT related errors
Andre Eisenbach [Wed, 9 Sep 2015 17:55:55 +0000 (17:55 +0000)]
Merge "Eliminate recursive calling when handling GATT related errors" into mnc-dr-dev
tturney [Tue, 8 Sep 2015 21:42:09 +0000 (14:42 -0700)]
Allow BT inquiry while discovery is in progress.
BT Inquiry is disallowed when service discovery
is in progress. Innitially when GATT discovery
is in progress (crosskey pairing), it resulted
in inquiry requests being rejected. During an
insecure connection like OPP, bonding link key
is not stored. In an earlier patch (
b820aec7),
BR/EDR discovery was bypassed if the bonding was
temporary. However, this was not done for LE.
Applying the same logic to LE, resolved the
inquiry issue reported in this bug.
Bug:
23468169
Change-Id: I6111c80a420aeb0bc36a0393eb215c112512d251
Pavlin Radoslavov [Sat, 5 Sep 2015 00:55:09 +0000 (17:55 -0700)]
Eliminate recursive calling when handling GATT related errors
If there are errors when processing GATT related events (e.g.,
configuring the MTU), don't use recursive calls into
bta_gattc_sm_execute(), because it breaks the free-ing of some
of the memory.
Bug:
23756301
Change-Id: I3c685170e868ffbf4e488d2bb5a31904e3f7b39d
wang ping [Tue, 8 Sep 2015 00:10:13 +0000 (00:10 +0000)]
am
2cf3fc0c: am
72abbbea: Fix issue where bluesleep idle timer is not started
* commit '
2cf3fc0c9ca6c7971fa55c6bdacf4aa9fe32e452':
Fix issue where bluesleep idle timer is not started
wang ping [Mon, 7 Sep 2015 23:56:39 +0000 (23:56 +0000)]
am
72abbbea: Fix issue where bluesleep idle timer is not started
* commit '
72abbbeaa9220cf30c1d9f21aadd52ba3dd6ea4e':
Fix issue where bluesleep idle timer is not started
wang ping [Sat, 5 Sep 2015 17:48:09 +0000 (10:48 -0700)]
Fix issue where bluesleep idle timer is not started
Sometimes allow_device_sleep() is called before wake_assert, this result in transmit_done
does not start idle timer. This is because the "wake_state" does not match while
allow_device_sleep() is called before wake_assert() is called. So start idle timer
anyway when transmit_done is called.
Bug:
23754156
Change-Id: I5437aea0abc4b7f5cf847701e2d0a889c6823fcb
Sharvil Nanavati [Fri, 4 Sep 2015 02:07:55 +0000 (19:07 -0700)]
resolved conflicts for merge of
a905eb62 to mnc-dr-dev-plus-aosp
Change-Id: I331ff78fefe13bd6fddd74d5c7e27f35dcd1c419
Sharvil Nanavati [Thu, 3 Sep 2015 21:03:00 +0000 (21:03 +0000)]
Merge "DO NOT MERGE Directly acquire wake locks from the Bluetooth stack." into cw-e-dev
Joshua Schwarz [Thu, 3 Sep 2015 06:21:02 +0000 (06:21 +0000)]
am
9ae991c1: Merge "Implementation of net_test_bluedroid as a GTest." into cw-e-dev
* commit '
9ae991c115a7a73e1bbcd5fc6faef1b7f59ae72e':
Implementation of net_test_bluedroid as a GTest.
tturney [Thu, 3 Sep 2015 04:24:11 +0000 (04:24 +0000)]
am
9863e115: am
65d1c84f: Fix btwrite timer timeout for Angler (2/2)
* commit '
9863e115d28a5c21c3ba7b5df44fc58c5b5d022b':
Fix btwrite timer timeout for Angler (2/2)
Joshua Schwarz [Wed, 2 Sep 2015 07:26:59 +0000 (07:26 +0000)]
Merge "Implementation of net_test_bluedroid as a GTest." into cw-e-dev
tturney [Wed, 2 Sep 2015 01:12:48 +0000 (01:12 +0000)]
am
65d1c84f: Fix btwrite timer timeout for Angler (2/2)
* commit '
65d1c84f5b4c2d452b4927ab7f8670a4951db3ce':
Fix btwrite timer timeout for Angler (2/2)
Arman Uguray [Tue, 1 Sep 2015 16:51:32 +0000 (16:51 +0000)]
am
fda4dc4a: am
10b54c4b: service: Implement IBluetooth.isMultiAdvertisementSupported()
* commit '
fda4dc4a9da7b846f971d9f053602abe6eac524b':
service: Implement IBluetooth.isMultiAdvertisementSupported()
Arman Uguray [Tue, 1 Sep 2015 16:51:31 +0000 (16:51 +0000)]
am
d7ae39a3: am
5d22fabf: gn-build: Add secondary build tree for gmock
* commit '
d7ae39a332d9119420ed08b15822c6cdd6a6328d':
gn-build: Add secondary build tree for gmock
Marie Janssen [Tue, 1 Sep 2015 16:51:30 +0000 (16:51 +0000)]
am
3ea68bbc: am
888f8856: brillo: add and install system startup files
* commit '
3ea68bbc7a9e8ec688adb820c649da2786f598e6':
brillo: add and install system startup files
Arman Uguray [Tue, 1 Sep 2015 16:37:35 +0000 (16:37 +0000)]
am
10b54c4b: service: Implement IBluetooth.isMultiAdvertisementSupported()
* commit '
10b54c4b7f1a863a27eca4158f256062ec9c3770':
service: Implement IBluetooth.isMultiAdvertisementSupported()
Arman Uguray [Tue, 1 Sep 2015 16:37:33 +0000 (16:37 +0000)]
am
5d22fabf: gn-build: Add secondary build tree for gmock
* commit '
5d22fabf158ca476623068db46a05345c8791760':
gn-build: Add secondary build tree for gmock
Marie Janssen [Tue, 1 Sep 2015 16:37:33 +0000 (16:37 +0000)]
am
888f8856: brillo: add and install system startup files
* commit '
888f8856774e9628b670da6ba779a36dd6a19ab9':
brillo: add and install system startup files
Sharvil Nanavati [Tue, 1 Sep 2015 06:50:05 +0000 (23:50 -0700)]
DO NOT MERGE Directly acquire wake locks from the Bluetooth stack.
The wake lock callouts go through JNI and then across Binder to
PowerManager. As a result, the cost of each callout is very high.
There are cases where the stack is acquiring and releasing the wake
lock tens of times per second. When that happens, the CPU load on
some devices can reach 100% and the RFCOMM throughput can drop by
50% or more.
This change reduces the cost of acqiring / releasing a wake lock.
Instead of JNI + Binder + PowerManager overhead, we simply write to
the /sys/power/wake_lock and /sys/power/wake_unlock nodes. The cost
of each is a single syscall.
Bug:
23375670
Change-Id: I760a86b557b02c3d70be7a902c943b7ee2f515b1
tturney [Mon, 31 Aug 2015 22:16:59 +0000 (15:16 -0700)]
Fix btwrite timer timeout for Angler (2/2)
When calculating the appropriate LPM's idle timeout,
the local chip name was NULL. This is fixed by calculating
LMP's idle timeout when the chip is enabling.
Bug:
23248798
Change-Id: I8ee2b28fb4363359e035e242fdcff8a736ee448c