OSDN Git Service
Sharvil Nanavati [Mon, 9 Nov 2015 17:13:54 +0000 (17:13 +0000)]
Fix broken test caused by misordered callback arguments.
am:
1b4c8b4ebb
* commit '
1b4c8b4ebbc2f529225737055ba030175c94c9ac':
Fix broken test caused by misordered callback arguments.
Sharvil Nanavati [Sat, 7 Nov 2015 10:12:16 +0000 (02:12 -0800)]
Fix broken test caused by misordered callback arguments.
Change-Id: I16976a2a680eab76af31090548c2efc53bebaa60
Andre Eisenbach [Fri, 6 Nov 2015 23:59:19 +0000 (23:59 +0000)]
Treat empty/truncated GATT cache as error
am:
1f656f15b1
* commit '
1f656f15b146febdba8ed0ef0ee444a1e3bd9c0b':
Treat empty/truncated GATT cache as error
Andre Eisenbach [Mon, 10 Aug 2015 06:38:42 +0000 (23:38 -0700)]
Treat empty/truncated GATT cache as error
Bug:
23054535
Change-Id: I6f60ff556204dabca91ce9075d5802d75fd35857
Andre Eisenbach [Fri, 6 Nov 2015 21:28:08 +0000 (21:28 +0000)]
Always update remote address type during LE scan
am:
7b9fe757f5
* commit '
7b9fe757f5df8c529c506b1c41403f2f3f204f9e':
Always update remote address type during LE scan
Andre Eisenbach [Thu, 5 Nov 2015 23:38:36 +0000 (15:38 -0800)]
Always update remote address type during LE scan
This will ensure that devices which do not contain a device name in the
advertising record are stored with the correct address type to ensure
re-connection to the device succeeds.
Bug:
25499163
Change-Id: I85f18ce2de267844c5d5ed49beeb448b9b074d74
Pavlin Radoslavov [Fri, 6 Nov 2015 01:55:14 +0000 (01:55 +0000)]
Removed libpower-related references.
am:
45a94e198e
* commit '
45a94e198ec424c1f15d9735a605a6876fa6a493':
Removed libpower-related references.
Pavlin Radoslavov [Thu, 5 Nov 2015 19:46:28 +0000 (11:46 -0800)]
Removed libpower-related references.
Removed libpower-related references, because those are not
needed anymore. Now, the wakelock-related calls and references
are implemented within osi/src/alarm.c
Change-Id: Ifdb232b9724af216b9b414f8b65e85cd713c20d3
Marie Janssen [Thu, 5 Nov 2015 15:47:49 +0000 (15:47 +0000)]
gn-build: Get net_test_bluetooth to compile
am:
3e54b60e10
* commit '
3e54b60e10093f48f1c4ea3414635bc942f9ecfe':
gn-build: Get net_test_bluetooth to compile
Marie Janssen [Thu, 11 Jun 2015 22:18:01 +0000 (15:18 -0700)]
gn-build: Get net_test_bluetooth to compile
This makes net_test_bluetooth compile.
Bug:
21584091
Change-Id: Id0c3d6bdcfd6f2c75c749e7f5a306645371fbb25
Andre Eisenbach [Wed, 4 Nov 2015 17:36:00 +0000 (17:36 +0000)]
Fix bug in SDP 128-bit UUID lookup
am:
526f3cc7e9
* commit '
526f3cc7e93214f4f3e2c7c3c648710ff7251446':
Fix bug in SDP 128-bit UUID lookup
Andre Eisenbach [Wed, 4 Nov 2015 17:35:48 +0000 (17:35 +0000)]
Do not mask out secure connections (SC) bit for BT <4.2
am:
97305504e5
* commit '
97305504e5771fdf76d16ca8583d5fc1680face8':
Do not mask out secure connections (SC) bit for BT <4.2
Andre Eisenbach [Wed, 4 Nov 2015 16:28:30 +0000 (08:28 -0800)]
Fix bug in SDP 128-bit UUID lookup
Also re-factored the surrounding code slightly to where it would have
prevented this type of bug in the first place...
Change-Id: I7b7ed4459c4f377d97b608bfe2e0c13aac31680e
Andre Eisenbach [Wed, 4 Nov 2015 16:20:22 +0000 (08:20 -0800)]
Do not mask out secure connections (SC) bit for BT <4.2
Bug:
25467621
Change-Id: Ifdb52295fa5b8c5a39524a722dc044227c735240
Bill Yi [Tue, 3 Nov 2015 22:30:40 +0000 (14:30 -0800)]
Andre Eisenbach [Mon, 2 Nov 2015 20:46:32 +0000 (20:46 +0000)]
Merge "Rename net_test_bluedroid to net_test_bluetooth"
am:
c2ad136c3e
* commit '
c2ad136c3e19ca526356d7fd6fe44dcc1e7aa062':
Rename net_test_bluedroid to net_test_bluetooth
Andre Eisenbach [Mon, 2 Nov 2015 20:39:59 +0000 (20:39 +0000)]
Merge "Rename net_test_bluedroid to net_test_bluetooth"
Andre Eisenbach [Mon, 2 Nov 2015 18:56:05 +0000 (18:56 +0000)]
Fix interop database unit test
am:
f2a7e6c4eb
* commit '
f2a7e6c4eba75d8c8a3103fe27bcd06f669d609e':
Fix interop database unit test
Andre Eisenbach [Mon, 2 Nov 2015 18:47:28 +0000 (10:47 -0800)]
Fix interop database unit test
Change-Id: Id2e45582b92e83804b55d4e8c918e32a6a2dab79
Andre Eisenbach [Fri, 30 Oct 2015 17:27:42 +0000 (17:27 +0000)]
Merge "Serialize remote version query over LE"
am:
a0a3dacd68
* commit '
a0a3dacd682cc3e8c9ee4b5a196e06aeada6cc49':
Serialize remote version query over LE
Andre Eisenbach [Fri, 30 Oct 2015 17:23:08 +0000 (17:23 +0000)]
Merge "Serialize remote version query over LE"
Andre Eisenbach [Thu, 29 Oct 2015 22:48:06 +0000 (15:48 -0700)]
Serialize remote version query over LE
Some devices (ex. Nexus Player remote) do not take well to having the
remote version queried while a remote feature request is also sent and
subsequently fail encryption.
This patch serializes the query of the remote version and requires both
remote features and the remote version to be read before calling a
connection established.
Bug:
25357767
Change-Id: Ie70eea241b47b81778d8e0df47f3a8f376316932
Andre Eisenbach [Fri, 30 Oct 2015 16:16:34 +0000 (16:16 +0000)]
Remove unused HCI_PROTO_REVISION
am:
879aeec727
* commit '
879aeec72706fc7bae66277350ae9a49648a73e7':
Remove unused HCI_PROTO_REVISION
Andre Eisenbach [Tue, 27 Oct 2015 20:26:19 +0000 (13:26 -0700)]
Remove unused HCI_PROTO_REVISION
Change-Id: Icec52e4e63b14f2fe7a61cf5077e40c5e8baeff5
Andre Eisenbach [Thu, 29 Oct 2015 18:18:20 +0000 (11:18 -0700)]
Rename net_test_bluedroid to net_test_bluetooth
Also remove other bluedroid references.
Change-Id: I349e48e50b0a0a45ca1267a765145299837601d3
Marie Janssen [Tue, 27 Oct 2015 23:20:54 +0000 (23:20 +0000)]
Enable kernel wakelocks and timers am:
28bf007f71
am:
77680a2b16
* commit '
77680a2b1622ccf356e97eb08f90d55023ea434c':
Enable kernel wakelocks and timers
Marie Janssen [Tue, 27 Oct 2015 23:12:28 +0000 (23:12 +0000)]
Enable kernel wakelocks and timers
am:
28bf007f71
* commit '
28bf007f7103ccd36d5fa2f87837947a27cc698d':
Enable kernel wakelocks and timers
Marie Janssen [Mon, 21 Sep 2015 17:49:08 +0000 (10:49 -0700)]
Enable kernel wakelocks and timers
Use kernel wakelocks now that they are available to us, and use thread
timers instead to eliminate bt_os_callouts usage.
Bug:
23390297
Change-Id: Ic9428457807eab5125d35eae3df6cd2a05a2a659
Andre Eisenbach [Tue, 27 Oct 2015 20:35:53 +0000 (20:35 +0000)]
Check remote LMP version before enabling secure connections am:
27e239dbd3
am:
a3f980ec88
* commit '
a3f980ec88bf8e0cac8e87c385b8df2e39847e99':
Check remote LMP version before enabling secure connections
Andre Eisenbach [Tue, 27 Oct 2015 20:30:54 +0000 (20:30 +0000)]
Check remote LMP version before enabling secure connections
am:
27e239dbd3
* commit '
27e239dbd31dd9ee7fab5fb8558fbd2292cf7e5d':
Check remote LMP version before enabling secure connections
Andre Eisenbach [Mon, 26 Oct 2015 20:49:17 +0000 (13:49 -0700)]
Check remote LMP version before enabling secure connections
Request remote version information for LE links when connecting and
ensure LMP version is >= 8 (Bluetooth 4.2) before setting the LinkKey
bits in the pairing request.
This is to ensure older remote devices do not get confused by the
additional bit(s) in the pairing request.
Bug:
25277879
Change-Id: I25424e541fa5244d8f522dffc62cdedc24f4f35b
Ajay Panicker [Tue, 27 Oct 2015 19:17:37 +0000 (19:17 +0000)]
Prevent integer overflows during GATT signing am:
b335ee9496
am:
0789953b15
* commit '
0789953b15199fb1b1717d34543e81d58862735b':
Prevent integer overflows during GATT signing
Ajay Panicker [Tue, 27 Oct 2015 19:07:55 +0000 (19:07 +0000)]
Prevent integer overflows during GATT signing
am:
b335ee9496
* commit '
b335ee9496e671bf0ef0ab28a5990c9a024ac06b':
Prevent integer overflows during GATT signing
Ajay Panicker [Fri, 23 Oct 2015 23:49:11 +0000 (16:49 -0700)]
Prevent integer overflows during GATT signing
Bug:
17901099
Change-Id: Ib61113b19c9c9798b9ea992fad0ce997dcc2e2f8
Andre Eisenbach [Sat, 24 Oct 2015 00:15:13 +0000 (00:15 +0000)]
Merge "Raise alarm callback thread priority" into mnc-dr-dev am:
2c8802ab5f
am:
20cca2ff6b
* commit '
20cca2ff6b7cb02d26d1e60bbe0303f14e7be3d4':
Raise alarm callback thread priority
Mattias Agren [Sat, 24 Oct 2015 00:15:10 +0000 (00:15 +0000)]
Reduce persistence on aquiring master role am:
59d9673187
am:
0be25b64e8
* commit '
0be25b64e8447f450af9527373134d95255cdcd9':
Reduce persistence on aquiring master role
Andre Eisenbach [Fri, 23 Oct 2015 23:52:57 +0000 (23:52 +0000)]
Merge "Raise alarm callback thread priority" into mnc-dr-dev
am:
2c8802ab5f
* commit '
2c8802ab5f4f73afe2a8b722d3b1bbd8e106fa24':
Raise alarm callback thread priority
Mattias Agren [Fri, 23 Oct 2015 23:52:49 +0000 (23:52 +0000)]
Reduce persistence on aquiring master role
am:
59d9673187
* commit '
59d9673187a50c259b42e5a71482304ab850a809':
Reduce persistence on aquiring master role
Andre Eisenbach [Fri, 23 Oct 2015 23:51:19 +0000 (23:51 +0000)]
Merge "Raise alarm callback thread priority" into mnc-dr-dev
Mattias Agren [Wed, 14 Oct 2015 15:05:58 +0000 (17:05 +0200)]
Reduce persistence on aquiring master role
Whenever a device has more than 1 ACL link active and transferring
data on one of its links via PAN, HH or JV (RFCOMM) the sys busy/idle
state toggles frequently. To avoid triggering role switches for each
of these events we filter this out and let the other SYS events handle
it in combination with other role policy management code. Ideally we
should revert the toggling to properly reflect the busy/idle state of
each profile but to limit risk of side effects at this stage we will
make this intermittent change.
This also affects audio streaming in certain cases.
Bug:
24570959,
25129209
Change-Id: I141e17ee069c82624e153fd8de5db90ae93724b9
Andre Eisenbach [Fri, 23 Oct 2015 17:40:36 +0000 (10:40 -0700)]
Raise alarm callback thread priority
Since alarms [/callbacks] are used in the critical audio path, raising
the thread priority is required to ensure timely encoding/transmission
of audio packets and avoiding thread pre-emption.
This patch indiscriminatly raises the (single) callback thread priority,
affecting all alarm callbacks. In the future, thread priotiry should be
adjusted based on the alarms pending in the queue.
Bug:
24570959
Change-Id: I64928fd7325f1d6f76815a185dbccf1e01ae30d2
Andre Eisenbach [Wed, 21 Oct 2015 22:12:14 +0000 (22:12 +0000)]
Workaround for H4 HCI stream corruption during LE scans am:
bdd19e0873
am:
2c50605cb6 -s ours
* commit '
2c50605cb64833e6763445590503994b9bb288f8':
Workaround for H4 HCI stream corruption during LE scans
Andre Eisenbach [Wed, 21 Oct 2015 20:58:52 +0000 (20:58 +0000)]
Remove absolute volume control whitelist am:
58593a0273
am:
e94a7d19bb
* commit '
e94a7d19bb41852d5eec825775ad49ecb1d03cc0':
Remove absolute volume control whitelist
Andre Eisenbach [Wed, 21 Oct 2015 20:58:49 +0000 (20:58 +0000)]
Fix 128-bit UUID byte order for GATT-over-BR/EDR am:
61968383a6
am:
f90c1f10cc
* commit '
f90c1f10cc10d5465106946bd81ec4cbbb46b376':
Fix 128-bit UUID byte order for GATT-over-BR/EDR
Andre Eisenbach [Wed, 21 Oct 2015 20:54:58 +0000 (20:54 +0000)]
Workaround for H4 HCI stream corruption during LE scans
am:
bdd19e0873
* commit '
bdd19e0873854567bb6bd9bc8905a87a3a4744c4':
Workaround for H4 HCI stream corruption during LE scans
Andre Eisenbach [Wed, 21 Oct 2015 20:54:55 +0000 (20:54 +0000)]
Remove absolute volume control whitelist
am:
58593a0273
* commit '
58593a02736ff9ac9bdccd0e3186602f17452cdf':
Remove absolute volume control whitelist
Andre Eisenbach [Wed, 21 Oct 2015 20:54:51 +0000 (20:54 +0000)]
Fix 128-bit UUID byte order for GATT-over-BR/EDR
am:
61968383a6
* commit '
61968383a63be05a335e26bc53ef39d9af98ad72':
Fix 128-bit UUID byte order for GATT-over-BR/EDR
Andre Eisenbach [Fri, 11 Sep 2015 04:41:39 +0000 (21:41 -0700)]
Workaround for H4 HCI stream corruption during LE scans
Sometimes, during result-heavy LE scans, the UART byte stream can become
corrupted, leading to assertions caused by mis-interpreting the bytes
following the corruption.
This workaround looks for tell-tale signs of a BLE event and attempts to
skip the correct amount of bytes in the stream to re-synchronize onto a
packet boundary.
Bug:
23934838
Change-Id: Ifadaecf8077cb1defc7134c59c97302fca660f81
Andre Eisenbach [Mon, 19 Oct 2015 23:06:20 +0000 (16:06 -0700)]
Remove absolute volume control whitelist
Remove the absolute volume control whitelist to enable absolute volume
control for all compatible devices.
Bug:
25081918
Change-Id: Iab0e4b4c4fd3dac0fefdf62ec80419dd64b56c0c
Andre Eisenbach [Wed, 21 Oct 2015 01:03:30 +0000 (18:03 -0700)]
Fix 128-bit UUID byte order for GATT-over-BR/EDR
128-bit UUIDs for GATT services discovered using SDP are byte-ordered
incorrectly. This patch fixes both the SDP discovery as well as the SDP
record creation code.
Bug:
24344122
Change-Id: Iee4bf33dcbbc5ee0f2380b48330107232bd0401b
Andre Eisenbach [Wed, 21 Oct 2015 02:20:27 +0000 (02:20 +0000)]
Fix 128-bit UUID byte order for GATT-over-BR/EDR am:
deb1c7c5cf
am:
7424d92e36
* commit '
7424d92e361dd1797f0f63ef7c17e3e40e3d18c7':
Fix 128-bit UUID byte order for GATT-over-BR/EDR
Andre Eisenbach [Wed, 21 Oct 2015 02:20:18 +0000 (02:20 +0000)]
Merge "Workaround for H4 HCI stream corruption during LE scans" into mnc-dr-dev am:
78870e0f38
am:
3d28925a71
* commit '
3d28925a718166c114737a6e4d0142b74a4d70db':
Workaround for H4 HCI stream corruption during LE scans
Andre Eisenbach [Wed, 21 Oct 2015 02:15:52 +0000 (19:15 -0700)]
resolve merge conflicts of
15a5c3f852 to mnc-dr-dev-plus-aosp.
Change-Id: I072cf4d4fe0f4338647c806c064817ded06ee223
Andre Eisenbach [Wed, 21 Oct 2015 02:00:07 +0000 (02:00 +0000)]
Fix 128-bit UUID byte order for GATT-over-BR/EDR
am:
deb1c7c5cf
* commit '
deb1c7c5cfacba8ec2d896f6bb120bdc81314d9a':
Fix 128-bit UUID byte order for GATT-over-BR/EDR
Andre Eisenbach [Wed, 21 Oct 2015 01:03:30 +0000 (18:03 -0700)]
Fix 128-bit UUID byte order for GATT-over-BR/EDR
128-bit UUIDs for GATT services discovered using SDP are byte-ordered
incorrectly. This patch fixes both the SDP discovery as well as the SDP
record creation code.
Bug:
24344122
Change-Id: Iee4bf33dcbbc5ee0f2380b48330107232bd0401b
Andre Eisenbach [Wed, 21 Oct 2015 01:37:00 +0000 (01:37 +0000)]
Merge "Workaround for H4 HCI stream corruption during LE scans" into mnc-dr-dev
am:
78870e0f38
* commit '
78870e0f38658e389e22dfba5da3f239f01966d7':
Workaround for H4 HCI stream corruption during LE scans
Andre Eisenbach [Wed, 21 Oct 2015 01:33:07 +0000 (01:33 +0000)]
Merge "Workaround for H4 HCI stream corruption during LE scans" into mnc-dr-dev
Andre Eisenbach [Wed, 21 Oct 2015 01:17:19 +0000 (01:17 +0000)]
Remove absolute volume control whitelist
am:
8289925079
* commit '
8289925079c40ec91fa99d0ea6817f796a66681a':
Remove absolute volume control whitelist
Andre Eisenbach [Fri, 11 Sep 2015 04:41:39 +0000 (21:41 -0700)]
Workaround for H4 HCI stream corruption during LE scans
Sometimes, during result-heavy LE scans, the UART byte stream can become
corrupted, leading to assertions caused by mis-interpreting the bytes
following the corruption.
This workaround looks for tell-tale signs of a BLE event and attempts to
skip the correct amount of bytes in the stream to re-synchronize onto a
packet boundary.
Bug:
23934838
Change-Id: Ifadaecf8077cb1defc7134c59c97302fca660f81
Scott James Remnant [Tue, 20 Oct 2015 23:15:56 +0000 (23:15 +0000)]
doc: add supported features document am:
ac43e88a0a
am:
2be3cd3f69
* commit '
2be3cd3f69513aac3a0a199c486f680dda6ad74a':
doc: add supported features document
Scott James Remnant [Tue, 20 Oct 2015 23:11:48 +0000 (23:11 +0000)]
doc: add supported features document
am:
ac43e88a0a
* commit '
ac43e88a0aa375e712683e2b218d876c616e6f5e':
doc: add supported features document
Scott James Remnant [Tue, 20 Oct 2015 22:54:06 +0000 (15:54 -0700)]
doc: add supported features document
Summarize the versions and roles of each profile/protocol listed
in our Qualified Design, and provide a link to the QDID.
Change-Id: I8cfbbd466c684cb95de5433b3d7fa0f1fd567689
Sharvil Nanavati [Fri, 4 Sep 2015 09:06:45 +0000 (02:06 -0700)]
DO NOT MERGE Revert "am
b3ca1b37: resolved conflicts for merge of
a905eb62 to mnc-dr-dev-plus-aosp"
This reverts commit
2f86b2fc188edb0ba50483e624bd982a594c6633, reversing
changes made to
15c3ad9c08b864f63ed2581a10a65107fbe04752.
Change-Id: I43500eb0513180db8ba5b4ecc9f2dec934173c7f
Scott James Remnant [Tue, 20 Oct 2015 01:46:48 +0000 (18:46 -0700)]
DO NOT MERGE fix am error for
1dffda3b
Change-Id: Ic11a786ccf99ae50178b906f2163500c3af55612
Scott James Remnant [Mon, 19 Oct 2015 17:48:06 +0000 (10:48 -0700)]
DO NOT MERGE Revert "DO NOT MERGE Use POSIX timer API for wake alarms instead of OSI callouts."
Also reverts:
"Fix build: use unsigned long long in arithmetic expression."
"Fix build: add LOG_TAG parameter to LOG_* macros."
These CLs cause build failures on various platforms, an alternate
approach is being developed.
Sharvil Nanavati [Tue, 20 Oct 2015 02:22:48 +0000 (02:22 +0000)]
DO NOT MERGE Revert "am
b3ca1b37: resolved conflicts for merge of
a905eb62 to mnc-dr-dev-plus-aosp"
am:
41ddf544d0 -s ours
* commit '
41ddf544d038e3ae0a26b6989bfb3d6727161e84':
DO NOT MERGE Revert "am
b3ca1b37: resolved conflicts for merge of
a905eb62 to mnc-dr-dev-plus-aosp"
Scott James Remnant [Tue, 20 Oct 2015 02:22:44 +0000 (02:22 +0000)]
DO NOT MERGE fix am error for
1dffda3b
am:
f9e2fe4b33 -s ours
* commit '
f9e2fe4b3307c70cae1a06b0736d9483b284d4a3':
DO NOT MERGE fix am error for
1dffda3b
Scott James Remnant [Tue, 20 Oct 2015 02:22:40 +0000 (02:22 +0000)]
DO NOT MERGE Revert "DO NOT MERGE Use POSIX timer API for wake alarms instead of OSI callouts."
am:
43838819bc -s ours
* commit '
43838819bc791d08cf087527e9ec4937bf516004':
DO NOT MERGE Revert "DO NOT MERGE Use POSIX timer API for wake alarms instead of OSI callouts."
Sharvil Nanavati [Fri, 4 Sep 2015 09:06:45 +0000 (02:06 -0700)]
DO NOT MERGE Revert "am
b3ca1b37: resolved conflicts for merge of
a905eb62 to mnc-dr-dev-plus-aosp"
This reverts commit
2f86b2fc188edb0ba50483e624bd982a594c6633, reversing
changes made to
15c3ad9c08b864f63ed2581a10a65107fbe04752.
Change-Id: I43500eb0513180db8ba5b4ecc9f2dec934173c7f
Scott James Remnant [Tue, 20 Oct 2015 01:48:52 +0000 (01:48 +0000)]
Correct project name in Style Guide am:
d20656568b
am:
bbc4dc331a
* commit '
bbc4dc331acb7d8f828a8a3cae08ba3b6e073cef':
Correct project name in Style Guide
Scott James Remnant [Tue, 20 Oct 2015 01:48:43 +0000 (01:48 +0000)]
Resolve merge resolution differences between branches am:
02a29284a2 -s ours
am:
39db8130c6
* commit '
39db8130c6cc109ada6f10f1f13fc92d419cb3b2':
Resolve merge resolution differences between branches
Scott James Remnant [Tue, 20 Oct 2015 01:46:48 +0000 (18:46 -0700)]
DO NOT MERGE fix am error for
1dffda3b
Change-Id: Ic11a786ccf99ae50178b906f2163500c3af55612
Scott James Remnant [Mon, 19 Oct 2015 17:48:06 +0000 (10:48 -0700)]
DO NOT MERGE Revert "DO NOT MERGE Use POSIX timer API for wake alarms instead of OSI callouts."
Also reverts:
"Fix build: use unsigned long long in arithmetic expression."
"Fix build: add LOG_TAG parameter to LOG_* macros."
These CLs cause build failures on various platforms, an alternate
approach is being developed.
Scott James Remnant [Tue, 20 Oct 2015 01:30:36 +0000 (01:30 +0000)]
Correct project name in Style Guide
am:
d20656568b
* commit '
d20656568beb2f3d1a6528771e6ac463ca92364c':
Correct project name in Style Guide
Scott James Remnant [Tue, 20 Oct 2015 01:30:28 +0000 (01:30 +0000)]
Resolve merge resolution differences between branches
am:
02a29284a2 -s ours
* commit '
02a29284a26a9d63210865ae9f086c0ad730ca78':
Resolve merge resolution differences between branches
Scott James Remnant [Tue, 20 Oct 2015 01:02:03 +0000 (18:02 -0700)]
Correct project name in Style Guide
Change-Id: I07f41629b06820b85bf95ca255c68fc2ea78217a
Scott James Remnant [Mon, 19 Oct 2015 23:23:28 +0000 (16:23 -0700)]
Resolve merge resolution differences between branches
Change-Id: I7b2f5bcf3a43aacdfbb740589ca1538ade149473
Andre Eisenbach [Mon, 19 Oct 2015 23:06:20 +0000 (16:06 -0700)]
Remove absolute volume control whitelist
Remove the absolute volume control whitelist to enable absolute volume
control for all compatible devices.
Bug:
25081918
Change-Id: Iab0e4b4c4fd3dac0fefdf62ec80419dd64b56c0c
Andre Eisenbach [Mon, 19 Oct 2015 21:12:04 +0000 (21:12 +0000)]
am
bb8196ad: am
36d0e2b9: Add Flic smart button to interop database
* commit '
bb8196ad8e20ad21da8a95ede61d396393689e70':
Add Flic smart button to interop database
Pavlin Radoslavov [Mon, 19 Oct 2015 21:12:03 +0000 (21:12 +0000)]
am
c85cd70f: am
1946f251: Add missing LOG_TAG as the first argument to LOG_ERROR()
* commit '
c85cd70f6661d5946efaa9920a22f674c6f65d36':
Add missing LOG_TAG as the first argument to LOG_ERROR()
Pavlin Radoslavov [Mon, 19 Oct 2015 21:12:03 +0000 (21:12 +0000)]
am
29d002b9: am
577862e0: Update the usage of fixed_queue.
* commit '
29d002b9b1ac73aac946eae1f6bf2cea8306b87b':
Update the usage of fixed_queue.
Scott James Remnant [Mon, 19 Oct 2015 21:12:01 +0000 (21:12 +0000)]
am
d0c2dd9d: resolved conflicts for
5b9b1b89 to stage-aosp-master
* commit '
d0c2dd9dc9081ef9a7a2750d5a87eae5abc011ab':
Raise BTU and HCI thread priorities
Andre Eisenbach [Mon, 19 Oct 2015 21:09:10 +0000 (14:09 -0700)]
am
36d0e2b9: Add Flic smart button to interop database
* commit '
36d0e2b97be8b04d6607e9c1d76bbd2c9c891305':
Add Flic smart button to interop database
Pavlin Radoslavov [Mon, 19 Oct 2015 21:09:10 +0000 (14:09 -0700)]
am
1946f251: Add missing LOG_TAG as the first argument to LOG_ERROR()
* commit '
1946f2516f5d1384ea7d25bb87d019c1875ae7f0':
Add missing LOG_TAG as the first argument to LOG_ERROR()
Pavlin Radoslavov [Mon, 19 Oct 2015 21:09:09 +0000 (14:09 -0700)]
am
577862e0: Update the usage of fixed_queue.
* commit '
577862e0d87891164a469afcecd1135bf04d1f6e':
Update the usage of fixed_queue.
Scott James Remnant [Mon, 19 Oct 2015 21:05:46 +0000 (14:05 -0700)]
resolved conflicts for
5b9b1b89 to stage-aosp-master
Change-Id: I26781a825590a9effbc7d622391775b2eca58902
Pavlin Radoslavov [Mon, 19 Oct 2015 20:39:29 +0000 (20:39 +0000)]
am
2bca3d2a: am
e29c3430: GKI cleanup - removed PORT_SCHEDULE_LOCK / UNLOCK macros
* commit '
2bca3d2a1f37d3469080b931735a117a8e6451c0':
GKI cleanup - removed PORT_SCHEDULE_LOCK / UNLOCK macros
Pavlin Radoslavov [Mon, 19 Oct 2015 20:39:28 +0000 (20:39 +0000)]
am
e40c734e: am
258c2538: GKI cleanup - moved GKI buffer allocation wrappers to OSI
* commit '
e40c734e67a59a7cd750a33a2d077ac6911768b0':
GKI cleanup - moved GKI buffer allocation wrappers to OSI
Pavlin Radoslavov [Mon, 19 Oct 2015 20:39:26 +0000 (20:39 +0000)]
am
91c7bdc6: am
9f1c9ad8: GKI cleanup - Moved struct TIMER_LIST_ENT to OSI
* commit '
91c7bdc622251b0feb69b5f78d614a0180e4aa2c':
GKI cleanup - Moved struct TIMER_LIST_ENT to OSI
Pavlin Radoslavov [Mon, 19 Oct 2015 20:39:25 +0000 (20:39 +0000)]
am
ae5a6159: am
1a3844f9: GKI cleanup - Replaced usage of GKI queue with OSI fixed_queue
* commit '
ae5a6159b675b5d01ce3731a292ba0ea9f3c8291':
GKI cleanup - Replaced usage of GKI queue with OSI fixed_queue
Pavlin Radoslavov [Mon, 19 Oct 2015 20:39:23 +0000 (20:39 +0000)]
am
5de9c923: am
1eb1ea0c: GKI cleanup - Moved functions GKI_disable() and GKI_enable() to OSI
* commit '
5de9c923d39c9fc9991620d7bd1572c38466d6ad':
GKI cleanup - Moved functions GKI_disable() and GKI_enable() to OSI
Pavlin Radoslavov [Mon, 19 Oct 2015 20:34:58 +0000 (20:34 +0000)]
am
b22aeb23: resolved conflicts for
c196f214 to stage-aosp-master
* commit '
b22aeb23fa102920199f2a537e6628bc8c3781eb':
GKI cleanup - Moved GKI_get_os_tick_count() to OSI
Pavlin Radoslavov [Mon, 19 Oct 2015 20:33:18 +0000 (13:33 -0700)]
am
e29c3430: GKI cleanup - removed PORT_SCHEDULE_LOCK / UNLOCK macros
* commit '
e29c3430bfee2d92ba09c3cb4780a577ffc90712':
GKI cleanup - removed PORT_SCHEDULE_LOCK / UNLOCK macros
Pavlin Radoslavov [Mon, 19 Oct 2015 20:33:17 +0000 (13:33 -0700)]
am
258c2538: GKI cleanup - moved GKI buffer allocation wrappers to OSI
* commit '
258c2538e3b62a8cdb403f2730c45d721e5292b4':
GKI cleanup - moved GKI buffer allocation wrappers to OSI
Pavlin Radoslavov [Mon, 19 Oct 2015 20:33:17 +0000 (13:33 -0700)]
am
9f1c9ad8: GKI cleanup - Moved struct TIMER_LIST_ENT to OSI
* commit '
9f1c9ad85759c7663e3bbc494f8e75b2f107da67':
GKI cleanup - Moved struct TIMER_LIST_ENT to OSI
Pavlin Radoslavov [Mon, 19 Oct 2015 20:33:16 +0000 (13:33 -0700)]
am
1a3844f9: GKI cleanup - Replaced usage of GKI queue with OSI fixed_queue
* commit '
1a3844f933bd63c8a381371dabfb35c6a0249e3e':
GKI cleanup - Replaced usage of GKI queue with OSI fixed_queue
Pavlin Radoslavov [Mon, 19 Oct 2015 20:33:15 +0000 (13:33 -0700)]
am
1eb1ea0c: GKI cleanup - Moved functions GKI_disable() and GKI_enable() to OSI
* commit '
1eb1ea0cf2da992a3193506806e571dcbe3ec947':
GKI cleanup - Moved functions GKI_disable() and GKI_enable() to OSI
Pavlin Radoslavov [Mon, 19 Oct 2015 20:24:32 +0000 (13:24 -0700)]
resolved conflicts for
c196f214 to stage-aosp-master
Change-Id: I3c8acd59271180d5c11760d08ea960bb90040a8e
Pavlin Radoslavov [Mon, 19 Oct 2015 20:00:33 +0000 (20:00 +0000)]
am
51d14a76: am
89ba148d: Disable opening network debug ports for security reasons
* commit '
51d14a7610d4802f5d007f4513b32f957b1e28ec':
Disable opening network debug ports for security reasons
Scott James Remnant [Mon, 19 Oct 2015 19:56:32 +0000 (19:56 +0000)]
am
b4ccca65: resolved conflicts for
2181f1a4 to stage-aosp-master
* commit '
b4ccca65781e92ef9096834db8537309917b9cea':
Fix PAN crash due to fd mismatch