OSDN Git Service
Geoff Mendal [Mon, 25 Jan 2016 13:19:40 +0000 (05:19 -0800)]
Import translations. DO NOT MERGE
Change-Id: If2d17f88e7fc56fc4e07a187774103d1bdb463a3
Auto-generated-cl: translation import
Sanket Agarwal [Fri, 22 Jan 2016 23:55:49 +0000 (15:55 -0800)]
Synchronize HF and AG volume.
Use normalization where required to convert from Android volume range to
HF volume range.
Bug: b/
26714956
Change-Id: Ia90ec6aba41d6f66ca2e34ecc877c52c80cd7a0c
Stephen Li [Thu, 21 Jan 2016 05:18:58 +0000 (21:18 -0800)]
Merge -s ours commit '
847fcb35ba'
Adam Lesinski [Thu, 21 Jan 2016 03:00:34 +0000 (03:00 +0000)]
Merge "Add traffic accounting to Bluetooth App."
am:
d23eaab475
* commit '
d23eaab4755da60af6b669b865fdbf0e07c8ab5a':
Add traffic accounting to Bluetooth App.
Adam Lesinski [Thu, 21 Jan 2016 02:23:50 +0000 (02:23 +0000)]
Merge "Add traffic accounting to Bluetooth App."
Adam Lesinski [Thu, 21 Jan 2016 02:22:05 +0000 (02:22 +0000)]
Merge "Add traffic accounting to Bluetooth App."
Ajay Panicker [Thu, 21 Jan 2016 01:39:42 +0000 (01:39 +0000)]
Merge "Add extra logging for BLE scans" am:
e9b5054375
am:
15d43d60be
* commit '
15d43d60be04035c107211fa8fc10956b41637be':
Add extra logging for BLE scans
Ajay Panicker [Thu, 21 Jan 2016 01:27:01 +0000 (01:27 +0000)]
Merge "Add extra logging for BLE scans"
am:
e9b5054375
* commit '
e9b505437574d21b7648ee18789f1124939df536':
Add extra logging for BLE scans
Adam Lesinski [Fri, 4 Dec 2015 00:17:17 +0000 (16:17 -0800)]
Add traffic accounting to Bluetooth App.
Update the Bluetooth app to build against the new Bluetooth HAL,
which expects to be given a calling UID when opening sockets and
expects a callback for energy info that accepts uid_traffic_t data.
Bug:
26039657
Change-Id: I23ffbe39041f11706376acfc6aba33ba661a6ef1
Adam Lesinski [Fri, 4 Dec 2015 00:17:17 +0000 (16:17 -0800)]
Add traffic accounting to Bluetooth App.
Update the Bluetooth app to build against the new Bluetooth HAL,
which expects to be given a calling UID when opening sockets and
expects a callback for energy info that accepts uid_traffic_t data.
Bug:
26039657
Change-Id: I23ffbe39041f11706376acfc6aba33ba661a6ef1
Ajay Panicker [Thu, 21 Jan 2016 00:31:25 +0000 (00:31 +0000)]
Merge "Add extra logging for BLE scans"
Ajay Panicker [Fri, 15 Jan 2016 01:59:10 +0000 (17:59 -0800)]
Add extra logging for BLE scans
Added logging for application name, number of scans, and scan times
for each application that uses gatt scanning.
Example output:
GATT Client Map
Entries: 1
Application Name: com.broadcom.app.leexplorer (Registered)
LE scans (started/stopped) : 4 / 4
Scan time in ms (min/max/avg) : 6 / 7321 / 2744
Time since last scan ended in ms : 3522
Last 4 scans in ms (oldest first): 763 6 7321 2887
Application ID : 5
UUID :
f69badb3-212b-40b5-b5b3-
3bf9214310f9
Connections: 1
5: 6B:1F:6C:45:3D:DC
Bug:
26463429
Change-Id: I52376541a5b5874d0e40978990149a1283fd9c6a
Ajay Panicker [Fri, 15 Jan 2016 01:59:10 +0000 (17:59 -0800)]
Add extra logging for BLE scans
Added logging for application name, number of scans, and scan times
for each application that uses gatt scanning.
Example output:
GATT Client Map
Entries: 1
Application Name: com.broadcom.app.leexplorer (Registered)
LE scans (started/stopped) : 4 / 4
Scan time in ms (min/max/avg) : 6 / 7321 / 2744
Time since last scan ended in ms : 3522
Last 4 scans in ms (oldest first): 763 6 7321 2887
Application ID : 5
UUID :
f69badb3-212b-40b5-b5b3-
3bf9214310f9
Connections: 1
5: 6B:1F:6C:45:3D:DC
Bug:
26463429
Change-Id: I52376541a5b5874d0e40978990149a1283fd9c6a
Sanket Agarwal [Wed, 20 Jan 2016 01:38:51 +0000 (01:38 +0000)]
Merge "A2DP Sink:Audio Rendering patch and AutoConnect Functionality" am:
a22d9acc77
am:
f648ebe608
* commit '
f648ebe608f62462c90f84235df774abbcf2ad47':
A2DP Sink:Audio Rendering patch and AutoConnect Functionality
Sanket Agarwal [Wed, 20 Jan 2016 01:26:14 +0000 (01:26 +0000)]
Merge "A2DP Sink:Audio Rendering patch and AutoConnect Functionality"
am:
a22d9acc77
* commit '
a22d9acc77d60cfad31ecfe67cef806657406725':
A2DP Sink:Audio Rendering patch and AutoConnect Functionality
Sanket Agarwal [Wed, 20 Jan 2016 00:23:38 +0000 (00:23 +0000)]
Merge "A2DP Sink:Audio Rendering patch and AutoConnect Functionality"
Sanket Agarwal [Tue, 22 Dec 2015 21:45:00 +0000 (13:45 -0800)]
A2DP Sink:Audio Rendering patch and AutoConnect Functionality
- Add autoconnect functionality for A2DP Sink
- Use AudioPatch mechanism for sink playback
- AudioFocus approach to manage concurrencies
A2DP Sink: Support for AudioTrack
- add support for audiotrack to render audio data
- add support for AVRCP State to trigger audio
rendering
AVRCP_CTRL: add support for AVRCP 1.3 Controller
- fill placeholder function for AVRCP 1.3
- add supporting classes to handle AVRCP Commands
AVRCP Controller: Support for retaining volume level and blocking streaming from remote.
- retain volume level on new connection request
- block streaming from remote.
Change-Id: I8c31fd1779b196ced0fb0870855b93263ea331ec
Jakub Pawlowski [Tue, 29 Dec 2015 21:21:30 +0000 (13:21 -0800)]
Implement createBondOutOfBand
This patch implements out of band pairing that uses optional data.
Currently it works only for LE transport, using Temporary Key value.
In future fields might be added to OOBData to support other options for
optional data.
Change-Id: I1b4942e656be7b5d1ae5a4bf9d867ffd74753798
Sanket Agarwal [Tue, 22 Dec 2015 21:45:00 +0000 (13:45 -0800)]
A2DP Sink:Audio Rendering patch and AutoConnect Functionality
- Add autoconnect functionality for A2DP Sink
- Use AudioPatch mechanism for sink playback
- AudioFocus approach to manage concurrencies
A2DP Sink: Support for AudioTrack
- add support for audiotrack to render audio data
- add support for AVRCP State to trigger audio
rendering
AVRCP_CTRL: add support for AVRCP 1.3 Controller
- fill placeholder function for AVRCP 1.3
- add supporting classes to handle AVRCP Commands
AVRCP Controller: Support for retaining volume level and blocking streaming from remote.
- retain volume level on new connection request
- block streaming from remote.
Change-Id: I8c31fd1779b196ced0fb0870855b93263ea331ec
Andre Eisenbach [Wed, 13 Jan 2016 18:52:09 +0000 (18:52 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am:
abb54d6d36 am:
6e9165b908 -s ours am:
44c3652b4c am:
5a1ae16f4e am:
d59eb61a3e -s ours am:
d6e1fa7c20 am:
44853bf994 am:
be149ebaf5 am:
695a68448c
am:
f54b7cfd12 -s ours
* commit '
f54b7cfd127ce744d1957947a631a92a242748f8':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Ashwini Munigala [Wed, 13 Jan 2016 18:48:57 +0000 (18:48 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am:
f81566bb85 am:
ff7beb91be am:
e005c18fa8 am:
f2b62a56da
am:
23157b02d8 -s ours
* commit '
23157b02d89ee2048be3be272b5c7821c88a882e':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Andre Eisenbach [Tue, 12 Jan 2016 20:44:38 +0000 (20:44 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am:
abb54d6d36 am:
6e9165b908 -s ours am:
44c3652b4c am:
5a1ae16f4e am:
d59eb61a3e -s ours am:
d6e1fa7c20 am:
44853bf994 am:
be149ebaf5
am:
695a68448c
* commit '
695a68448ce5ce7239e5abd3d16fd993aa72cb0e':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Andre Eisenbach [Tue, 12 Jan 2016 19:45:12 +0000 (19:45 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am:
abb54d6d36 am:
6e9165b908 -s ours am:
44c3652b4c am:
5a1ae16f4e am:
d59eb61a3e -s ours am:
d6e1fa7c20 am:
44853bf994
am:
be149ebaf5
* commit '
be149ebaf5bd027f75b7b983c6a1f3bd0f712faa':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Andre Eisenbach [Tue, 12 Jan 2016 19:36:47 +0000 (19:36 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am:
abb54d6d36 am:
6e9165b908 -s ours am:
44c3652b4c am:
5a1ae16f4e am:
d59eb61a3e -s ours am:
d6e1fa7c20
am:
44853bf994
* commit '
44853bf9949725ba84c30cb40dc2f99f8b701a70':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Andre Eisenbach [Tue, 12 Jan 2016 19:05:23 +0000 (19:05 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am:
abb54d6d36 am:
6e9165b908 -s ours am:
44c3652b4c am:
5a1ae16f4e am:
d59eb61a3e -s ours
am:
d6e1fa7c20
* commit '
d6e1fa7c20fbddbf9ea5fa7b042bfdf276c1463a':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Ashwini Munigala [Tue, 12 Jan 2016 19:02:42 +0000 (19:02 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am:
f81566bb85 am:
ff7beb91be am:
e005c18fa8
am:
f2b62a56da
* commit '
f2b62a56daf113d7ed533883dc9126ab410c498e':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Andre Eisenbach [Tue, 12 Jan 2016 19:02:36 +0000 (19:02 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am:
abb54d6d36 am:
6e9165b908 -s ours am:
44c3652b4c am:
5a1ae16f4e
am:
d59eb61a3e -s ours
* commit '
d59eb61a3ef94ef69bbbcf8e039895d0fb2fd379':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Andre Eisenbach [Tue, 12 Jan 2016 19:00:00 +0000 (19:00 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am:
abb54d6d36 am:
6e9165b908 -s ours am:
44c3652b4c
am:
5a1ae16f4e
* commit '
5a1ae16f4ee61b1686e178389485ef65001ed167':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Ashwini Munigala [Tue, 12 Jan 2016 18:57:03 +0000 (18:57 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am:
f81566bb85 am:
ff7beb91be
am:
e005c18fa8
* commit '
e005c18fa8fd19ef68580c57760e91735e66a48b':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Andre Eisenbach [Tue, 12 Jan 2016 18:56:46 +0000 (18:56 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am:
abb54d6d36 am:
6e9165b908 -s ours
am:
44c3652b4c
* commit '
44c3652b4cb824089768112a5a5614cb4346cd0f':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Ashwini Munigala [Tue, 12 Jan 2016 18:53:14 +0000 (18:53 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am:
f81566bb85
am:
ff7beb91be
* commit '
ff7beb91bee0db50b4ce03aba1b39a3362f767c6':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Andre Eisenbach [Tue, 12 Jan 2016 18:52:47 +0000 (18:52 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am:
abb54d6d36
am:
6e9165b908 -s ours
* commit '
6e9165b90881581d1c58eb974b304465340b08e7':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Ashwini Munigala [Tue, 12 Jan 2016 18:48:04 +0000 (18:48 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
am:
f81566bb85
* commit '
f81566bb85a1d0388b738dc5553d096591fc9030':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Andre Eisenbach [Tue, 12 Jan 2016 18:46:52 +0000 (18:46 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
am:
abb54d6d36
* commit '
abb54d6d3614cd86a6349303400b9cf2f83af4c7':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Jeremy Klein [Mon, 11 Jan 2016 19:10:26 +0000 (19:10 +0000)]
Merge "Use TETHER_PRIVILEGED to maintain access to tether permissions."
Jeff Sharkey [Sat, 9 Jan 2016 01:32:04 +0000 (18:32 -0700)]
Follow AIDL refactoring.
Bug:
26471205
Change-Id: I20aa94fb599eda9ee4b1d0b8de208aecb9e560e7
Ashwini Munigala [Thu, 7 Jan 2016 19:30:03 +0000 (19:30 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue am:
1983bccf61
am:
e7bdb9a333 -s ours
* commit '
e7bdb9a333e9610bb654cce8858d8f8aadbb629d':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Ashwini Munigala [Thu, 7 Jan 2016 19:28:17 +0000 (19:28 +0000)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
am:
1983bccf61
* commit '
1983bccf614d61dfcf20ba3cbf14f4ebf7f49943':
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Ashwini Munigala [Mon, 7 Sep 2015 16:08:09 +0000 (21:38 +0530)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Receive and handle ACTION_MESSAGE_SENT intent for SMS type
message to move it to SENT folder when pushMessage request
from MCE is processed and SMS delivered successfully.
Bug:
22343270
CRs-Fixed: 903561
Change-Id: I337fb1fb870873bf9f1add58d6d898465fc003c8
Andre Eisenbach [Wed, 6 Jan 2016 17:58:42 +0000 (17:58 +0000)]
Merge "Enforce BLUETOOTH_PRIVILEGED permission for FIDO U2F over GATT" am:
28ca6b2d79
am:
b145f33f93
* commit '
b145f33f93ad319ce11e541f5ae48888f07de719':
Enforce BLUETOOTH_PRIVILEGED permission for FIDO U2F over GATT
Andre Eisenbach [Wed, 6 Jan 2016 17:54:58 +0000 (17:54 +0000)]
Merge "Enforce BLUETOOTH_PRIVILEGED permission for FIDO U2F over GATT"
am:
28ca6b2d79
* commit '
28ca6b2d791358a1938c5ab1693f01522c4338f4':
Enforce BLUETOOTH_PRIVILEGED permission for FIDO U2F over GATT
Andre Eisenbach [Wed, 6 Jan 2016 17:50:32 +0000 (17:50 +0000)]
Merge "Enforce BLUETOOTH_PRIVILEGED permission for FIDO U2F over GATT"
Alexei Czeskis [Tue, 22 Dec 2015 22:16:27 +0000 (14:16 -0800)]
Enforce BLUETOOTH_PRIVILEGED permission for FIDO U2F over GATT
All access to external Bluetooth U2F devices must go through system
APIs so that calling apps cannot spoof their idenity. This change
blocks the whole FIDO U2F service from being accessed.
Change-Id: I122849452c09fb8bc3bff9ead2db1edf64ddfabc
Casper Bonde [Mon, 4 Jan 2016 19:34:38 +0000 (19:34 +0000)]
Fix memory leak in Bluetooth AVRCP JNI am:
3a4b8693ee
am:
4009e878cc
* commit '
4009e878cc5efe3a78efb02c0f543398369223e3':
Fix memory leak in Bluetooth AVRCP JNI
Casper Bonde [Mon, 4 Jan 2016 19:32:32 +0000 (19:32 +0000)]
Fix memory leak in Bluetooth AVRCP JNI
am:
3a4b8693ee
* commit '
3a4b8693ee49932247a96099942fa1cecb4670bc':
Fix memory leak in Bluetooth AVRCP JNI
Casper Bonde [Mon, 4 Jan 2016 15:13:13 +0000 (16:13 +0100)]
Fix memory leak in Bluetooth AVRCP JNI
When rebasing change-id I3941793f9843abf4afa5ffbee40d1d01c118b29b
later change
bbb4110b455b3aa29106d5b4f0a37e1be8e09475 in AOSP,
a memory leak fix was removed by accident. This patch re-enables
the memory leak fix.
Bug:
26383160
Change-Id: I70fd2ea00f6135803f92aad3adda9ce38f47cc32
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
Jeremy Klein [Mon, 28 Dec 2015 23:14:31 +0000 (15:14 -0800)]
Use TETHER_PRIVILEGED to maintain access to tether permissions.
BUG:
26247383
Change-Id: I25a89bc564b89de683e61ed00f1e311c8c69b62c
Andre Eisenbach [Tue, 29 Dec 2015 21:37:08 +0000 (13:37 -0800)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Receive and handle ACTION_MESSAGE_SENT intent for SMS type
message to move it to SENT folder when pushMessage request
from MCE is processed and SMS delivered successfully.
Bug:
22343270
CRs-Fixed: 903561
Change-Id: I9dafffc737a34233ede2d10e22cd969f520a12cf
Ashwini Munigala [Mon, 7 Sep 2015 16:08:09 +0000 (21:38 +0530)]
DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue
Receive and handle ACTION_MESSAGE_SENT intent for SMS type
message to move it to SENT folder when pushMessage request
from MCE is processed and SMS delivered successfully.
Bug:
22343270
CRs-Fixed: 903561
Change-Id: I9dafffc737a34233ede2d10e22cd969f520a12cf
Alexei Czeskis [Tue, 22 Dec 2015 22:16:27 +0000 (14:16 -0800)]
Enforce BLUETOOTH_PRIVILEGED permission for FIDO U2F over GATT
All access to external Bluetooth U2F devices must go through system
APIs so that calling apps cannot spoof their idenity. This change
blocks the whole FIDO U2F service from being accessed.
Change-Id: I122849452c09fb8bc3bff9ead2db1edf64ddfabc
Ashwini Munigala [Mon, 7 Sep 2015 16:08:09 +0000 (21:38 +0530)]
Fix SMS delivered successfully but stuck SENDING issue
Receive and handle ACTION_MESSAGE_SENT intent for SMS type
message to move it to SENT folder when pushMessage request
from MCE is processed and SMS delivered successfully.
Change-Id: I9dafffc737a34233ede2d10e22cd969f520a12cf
CRs-Fixed: 903561
Bryce Lee [Fri, 18 Dec 2015 23:15:35 +0000 (23:15 +0000)]
Map Bluetooth profiles correctly in isProfileDisabled helper function. am:
0a9659da81 am:
c88e96d906
am:
15446e898b
* commit '
15446e898b8f832b46be44249058cbd2b9a1a7d5':
Map Bluetooth profiles correctly in isProfileDisabled helper function.
Bryce Lee [Fri, 18 Dec 2015 23:13:11 +0000 (23:13 +0000)]
Map Bluetooth profiles correctly in isProfileDisabled helper function. am:
0a9659da81
am:
c88e96d906
* commit '
c88e96d90674d9b19e8bc904efc05bd64a268853':
Map Bluetooth profiles correctly in isProfileDisabled helper function.
Bryce Lee [Fri, 18 Dec 2015 23:07:05 +0000 (23:07 +0000)]
Map Bluetooth profiles correctly in isProfileDisabled helper function.
am:
0a9659da81
* commit '
0a9659da81c1367bf40a8340ecdff4227f88203b':
Map Bluetooth profiles correctly in isProfileDisabled helper function.
Bryce Lee [Fri, 18 Dec 2015 19:33:47 +0000 (11:33 -0800)]
Map Bluetooth profiles correctly in isProfileDisabled helper function.
Change-Id: Ic38736a653e6413f1f3bb41c8dfe049abe8883f0
Bryce Lee [Fri, 18 Dec 2015 01:52:16 +0000 (01:52 +0000)]
Monitor disabled profile setting and enable/disable profiles on change. am:
3602a64c6b am:
14675b24f4
am:
7504ddeec9
* commit '
7504ddeec934d6107b251fb45fefcddb8259e0ae':
Monitor disabled profile setting and enable/disable profiles on change.
Bryce Lee [Thu, 17 Dec 2015 19:50:40 +0000 (19:50 +0000)]
Monitor disabled profile setting and enable/disable profiles on change. am:
3602a64c6b
am:
14675b24f4
* commit '
14675b24f4c1bf1800ecd243a71fcdd96c9818af':
Monitor disabled profile setting and enable/disable profiles on change.
Bryce Lee [Thu, 17 Dec 2015 19:44:37 +0000 (11:44 -0800)]
Monitor disabled profile setting and enable/disable profiles on change.
am:
3602a64c6b
* commit '
3602a64c6bbe46775cba67f064af39c89d888c5c':
Monitor disabled profile setting and enable/disable profiles on change.
Bryce Lee [Thu, 17 Dec 2015 19:39:46 +0000 (11:39 -0800)]
Monitor disabled profile setting and enable/disable profiles on change.
Bug:
25900899
Change-Id: Id98ae58ada8eecd33a2c86970d9d20ae061680be
Alan Viverette [Wed, 16 Dec 2015 19:29:43 +0000 (14:29 -0500)]
Removed DayNight theme from public APIs (again)
Bug:
22628106
Change-Id: I76b21dd25d7a4991e4cef601644997dc59fb4cd0
Geoff Mendal [Wed, 16 Dec 2015 13:57:06 +0000 (05:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic8facc9a120d431a05af24cc781d554f104a2ee8
Auto-generated-cl: translation import
Andre Eisenbach [Mon, 14 Dec 2015 23:30:00 +0000 (23:30 +0000)]
Merge "Fix race condition when doing GATT discovery" am:
82e316efe6
am:
9ff4e56e2b
* commit '
9ff4e56e2b6ade75aba3c48ed26eab06290bbf61':
Fix race condition when doing GATT discovery
Andre Eisenbach [Mon, 14 Dec 2015 23:13:41 +0000 (23:13 +0000)]
Merge "Fix race condition when doing GATT discovery"
am:
82e316efe6
* commit '
82e316efe6568d498a9bca1477745c429ac287d1':
Fix race condition when doing GATT discovery
Andre Eisenbach [Mon, 14 Dec 2015 22:47:11 +0000 (22:47 +0000)]
Merge "Fix race condition when doing GATT discovery"
Jakub Pawlowski [Sat, 12 Dec 2015 06:35:01 +0000 (22:35 -0800)]
Fix race condition when doing GATT discovery
Right now if discovery to multiple GATT clients is happening
simultaneously, onSearchComplete will be run only for device that
finishes discovery last, while it should be run for each device.
mSearchQueue is one for all discovery sessions. Instead of checking if
it's empty, we must check if there are no elements for given connId.
Bug:
26038939
Change-Id: I9417cd7be8cab4b808ce7f045861e1adc2055629
Sanket Agarwal [Tue, 1 Dec 2015 23:01:53 +0000 (15:01 -0800)]
Delegate HFP Audio focus (HF) to entity controlling the actual phone call.
HF role currently handles audio focus itself although the idea is to
have telecom stack do it (it already does in ConnectionService and
CallAudioManager). We rip out the Audio focus management and ringer
control from the state machine and only leave the audio routing and
volume control here.
SCO routing and volume control is currently still handled by Hfp Client
since audio manager does not yet support HF responsibilities.
Bug: b/
25261431
Change-Id: I893654de2427cf031c7cddda888ed3694b0001be
Bryce Lee [Wed, 18 Nov 2015 17:53:28 +0000 (17:53 +0000)]
Allow for automatic routing on HF AG to be disabled. am:
9e1b34b2a5 am:
e58438d821
am:
96cc39659f
* commit '
96cc39659fc9a96e91c9c742893ea8a0308891d7':
Bryce Lee [Tue, 17 Nov 2015 16:28:12 +0000 (16:28 +0000)]
Allow for automatic routing on HF AG to be disabled. am:
9e1b34b2a5
am:
e58438d821
* commit '
e58438d821210e57c2240befdaa99e4ab996c51c':
Allow for automatic routing on HF AG to be disabled.
Bryce Lee [Tue, 17 Nov 2015 16:17:24 +0000 (16:17 +0000)]
Allow for automatic routing on HF AG to be disabled. am:
9e1b34b2a5
am:
e58438d821
* commit '
e58438d821210e57c2240befdaa99e4ab996c51c':
Allow for automatic routing on HF AG to be disabled.
Bryce Lee [Tue, 17 Nov 2015 16:14:24 +0000 (16:14 +0000)]
Allow for automatic routing on HF AG to be disabled.
am:
9e1b34b2a5
* commit '
9e1b34b2a5a80c9b16cfc9e71fd4ff015086ab16':
Allow for automatic routing on HF AG to be disabled.
Bryce Lee [Mon, 16 Nov 2015 18:35:39 +0000 (10:35 -0800)]
Allow for automatic routing on HF AG to be disabled.
Bug:
25485578
Change-Id: Iefe06f9df811311040f154ddf8f578893b275ef4
Geoff Mendal [Wed, 11 Nov 2015 13:07:53 +0000 (05:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ieb138f1a60035295b5090b6b958c6b4c24866f9e
Auto-generated-cl: translation import
Jean-Michel Trivi [Mon, 9 Nov 2015 23:04:14 +0000 (15:04 -0800)]
Remove useless imports
Change-Id: I306df32b76612d5de2b8741e858298fd7aae5c36
Geoff Mendal [Mon, 9 Nov 2015 14:16:02 +0000 (06:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie3b04b02fbfbd80b4e6777b34cd5c37517593b4c
Auto-generated-cl: translation import
Baligh Uddin [Sat, 7 Nov 2015 15:27:06 +0000 (15:27 +0000)]
Import translations. DO NOT MERGE am:
12322a0f80 -s ours
am:
5a83d1dca8 -s ours
* commit '
5a83d1dca8c1fb21d1d8201d28c655888b8db6d8':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 20:00:53 +0000 (20:00 +0000)]
Import translations. DO NOT MERGE
am:
12322a0f80 -s ours
* commit '
12322a0f8069c920f08860ee3b53909a7a69934f':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 00:53:25 +0000 (16:53 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I1df36416f00aad1d846e69fb1312f4b973fa61f9
Bryce Lee [Thu, 29 Oct 2015 18:18:41 +0000 (18:18 +0000)]
Implement setting/getting whether audio can be routed to the HFP HF device. am:
22bb394443 am:
c3da0f7bb3
am:
80ebb2a7df
* commit '
80ebb2a7dfb1aa1cd44f06d989801b628e138f98':
Implement setting/getting whether audio can be routed to the HFP HF device.
Bryce Lee [Thu, 29 Oct 2015 18:16:42 +0000 (18:16 +0000)]
Revert "Allow HFP HF implementations to specify a client controller." am:
84d1aab871 am:
4af80a65ff
am:
d6dfef0fc5
* commit '
d6dfef0fc53f2cf6f36246411af5fabf360f22a0':
Revert "Allow HFP HF implementations to specify a client controller."
Bryce Lee [Thu, 29 Oct 2015 18:14:51 +0000 (18:14 +0000)]
Allow HFP HF implementations to specify a client controller. am:
8843d8a825 am:
13a0edb5e7
am:
831b78a467
* commit '
831b78a4678a209fa4e4b72929f033956881ec1b':
Allow HFP HF implementations to specify a client controller.
Bryce Lee [Thu, 29 Oct 2015 07:19:03 +0000 (07:19 +0000)]
Implement setting/getting whether audio can be routed to the HFP HF device. am:
22bb394443
am:
c3da0f7bb3
* commit '
c3da0f7bb39fc5d234a360bc6a1dd6c1d8382ee2':
Implement setting/getting whether audio can be routed to the HFP HF device.
Bryce Lee [Thu, 29 Oct 2015 07:15:39 +0000 (07:15 +0000)]
Implement setting/getting whether audio can be routed to the HFP HF device.
am:
22bb394443
* commit '
22bb39444356637fbcabd4acf04f2fdb9e3da177':
Implement setting/getting whether audio can be routed to the HFP HF device.
Bryce Lee [Thu, 29 Oct 2015 06:00:29 +0000 (23:00 -0700)]
Implement setting/getting whether audio can be routed to the HFP HF device.
Bug:
25332357
Change-Id: I2d37d082673255a165dad955aa1ca4b9f00d599e
Bryce Lee [Thu, 29 Oct 2015 05:10:04 +0000 (05:10 +0000)]
Revert "Allow HFP HF implementations to specify a client controller." am:
84d1aab871
am:
4af80a65ff
* commit '
4af80a65ffe6570bdd9d86dd5b3a6e7e66211ff1':
Revert "Allow HFP HF implementations to specify a client controller."
Bryce Lee [Thu, 29 Oct 2015 05:06:17 +0000 (05:06 +0000)]
Revert "Allow HFP HF implementations to specify a client controller."
am:
84d1aab871
* commit '
84d1aab871b03d94dddce4ad2d17f3c2acb892b5':
Revert "Allow HFP HF implementations to specify a client controller."
Bryce Lee [Thu, 29 Oct 2015 04:58:02 +0000 (04:58 +0000)]
Revert "Allow HFP HF implementations to specify a client controller."
This reverts commit
8843d8a82571b0a2f1b003cad999bed595814257.
Change-Id: I5371e263fd92c6790558d38f19945492731e17f6
Bryce Lee [Thu, 29 Oct 2015 04:48:56 +0000 (04:48 +0000)]
Allow HFP HF implementations to specify a client controller. am:
8843d8a825
am:
13a0edb5e7
* commit '
13a0edb5e7661b2553b5ffe0a330c1eebad268d4':
Allow HFP HF implementations to specify a client controller.
Bryce Lee [Thu, 29 Oct 2015 04:44:37 +0000 (04:44 +0000)]
Allow HFP HF implementations to specify a client controller.
am:
8843d8a825
* commit '
8843d8a82571b0a2f1b003cad999bed595814257':
Allow HFP HF implementations to specify a client controller.
Bryce Lee [Thu, 29 Oct 2015 04:08:54 +0000 (21:08 -0700)]
Allow HFP HF implementations to specify a client controller.
The client controller service is used by the HeadsetClientService to
determine conditions such as whether audio routing to device is permitted.
Bug:
25332357
Change-Id: I8971960f959084ed3969db7c8cdef11673a58994
Tony Mak [Tue, 27 Oct 2015 23:35:04 +0000 (23:35 +0000)]
Merge "Proper fix of contact_id in bluetooth"
Zach Johnson [Mon, 26 Oct 2015 17:10:41 +0000 (17:10 +0000)]
Remove receiver status foreground flag am:
65842bfe88 am:
4a894feccc
am:
8d8b8093f7
* commit '
8d8b8093f727b552e0b5a3d9c4423b4a00e7dfcf':
Remove receiver status foreground flag
Zach Johnson [Mon, 26 Oct 2015 17:05:52 +0000 (17:05 +0000)]
Remove receiver status foreground flag am:
65842bfe88
am:
4a894feccc
* commit '
4a894feccc7066b1f4b3c7b0eec61dc69d474d6f':
Remove receiver status foreground flag
Zach Johnson [Mon, 26 Oct 2015 17:01:35 +0000 (17:01 +0000)]
Remove receiver status foreground flag
am:
65842bfe88
* commit '
65842bfe88b3d91060cd05446024f14061524dcd':
Remove receiver status foreground flag
Zach Johnson [Mon, 26 Oct 2015 16:47:48 +0000 (09:47 -0700)]
Remove receiver status foreground flag
Turns out this actually causes more problems than
it attempts to solve.
b/
25116554
b/
25256719
Change-Id: Ia30ab5bf0f6e794376eae85b2616bcdb0049ef76
Bryce Lee [Fri, 23 Oct 2015 21:08:25 +0000 (21:08 +0000)]
Allow for supported profiles to be reloaded on enable. am:
371e2047c4 am:
ec7a8e9141
am:
51c261d7ba
* commit '
51c261d7ba934072bd05acca51439c03af644b17':
Allow for supported profiles to be reloaded on enable.
Bryce Lee [Fri, 23 Oct 2015 21:02:47 +0000 (21:02 +0000)]
Allow for supported profiles to be reloaded on enable. am:
371e2047c4
am:
ec7a8e9141
* commit '
ec7a8e91415bc247c37e9d896e61aadd42bb1884':
Allow for supported profiles to be reloaded on enable.
Bryce Lee [Fri, 23 Oct 2015 20:57:44 +0000 (20:57 +0000)]
Allow for supported profiles to be reloaded on enable.
am:
371e2047c4
* commit '
371e2047c485f8f75c2b63a38b36a65b72c2fa42':
Allow for supported profiles to be reloaded on enable.
Bryce Lee [Fri, 23 Oct 2015 19:30:29 +0000 (12:30 -0700)]
Allow for supported profiles to be reloaded on enable.
Bug:
24977590
Change-Id: I2e5371d3333482cdd1cf18d48fe3c2e0f2229e42
Ajay Panicker [Thu, 22 Oct 2015 23:50:18 +0000 (23:50 +0000)]
Merge "Remove Vcard filter for call-logs" am:
1368195719 am:
3ad53eb814
am:
9873a44c66
* commit '
9873a44c66afac7cb874e482cc71636170a1955d':
Remove Vcard filter for call-logs
Ajay Panicker [Thu, 22 Oct 2015 23:48:40 +0000 (23:48 +0000)]
Remove Vcard filter for call-logs am:
b211df6fcb am:
d83da25118 am:
afe7ca2198
am:
eeb5647233
* commit '
eeb56472331cced520d7bc1fb492d2c828ba80f7':
Remove Vcard filter for call-logs