OSDN Git Service
Andre Eisenbach [Fri, 5 Dec 2014 21:50:02 +0000 (21:50 +0000)]
am
301c55e4: am
a4fa77d1: am
cf7f6a15: Prevent Java call for acquiring already held wakelock
* commit '
301c55e4053f496496db67923f1d80313b348ce6':
Prevent Java call for acquiring already held wakelock
Andre Eisenbach [Fri, 5 Dec 2014 21:40:14 +0000 (21:40 +0000)]
am
a4fa77d1: am
cf7f6a15: Prevent Java call for acquiring already held wakelock
* commit '
a4fa77d1bc661bc72e00e81ce17af0ac4569d41d':
Prevent Java call for acquiring already held wakelock
Andreas Gampe [Fri, 5 Dec 2014 19:36:48 +0000 (19:36 +0000)]
am
6bf8a5e0: am
d32ffc7e: Merge "Bluetooth: Turn off unused-XXX warnings"
* commit '
6bf8a5e01c15db12aaf7b3b42256f5fa99409685':
Bluetooth: Turn off unused-XXX warnings
Andreas Gampe [Fri, 5 Dec 2014 19:28:11 +0000 (19:28 +0000)]
am
d32ffc7e: Merge "Bluetooth: Turn off unused-XXX warnings"
* commit '
d32ffc7e0661f6fa60ca3fe36acb14d2be953564':
Bluetooth: Turn off unused-XXX warnings
Andreas Gampe [Fri, 5 Dec 2014 19:15:29 +0000 (19:15 +0000)]
Merge "Bluetooth: Turn off unused-XXX warnings"
Andreas Gampe [Fri, 5 Dec 2014 01:55:57 +0000 (17:55 -0800)]
Bluetooth: Turn off unused-XXX warnings
For build-system CFLAGS clean-up, disable warnings locally.
Should be reverted when the code is fixed.
Bug:
18632512
Change-Id: I2356dbbe89d1ccec5b0bd0b60ab06bf57ce021d1
Matthew Xie [Fri, 5 Dec 2014 00:15:36 +0000 (00:15 +0000)]
am
2f51cdec: am
d6984958: Merge "Revert "Correct the OBEX OPP Profile version""
* commit '
2f51cdec0acc9c43c2986ed24b3019719bb4b2d7':
Revert "Correct the OBEX OPP Profile version"
Wei Wang [Fri, 5 Dec 2014 00:14:44 +0000 (00:14 +0000)]
am
6fadce76: am
e608a529: Merge "Remove unnecessary check of multiple advertise instance count." into lmp-mr1-dev
* commit '
6fadce76d56cebb4821856127cd89a2eada3d80a':
Remove unnecessary check of multiple advertise instance count.
Matthew Xie [Thu, 4 Dec 2014 22:44:52 +0000 (22:44 +0000)]
am
d6984958: Merge "Revert "Correct the OBEX OPP Profile version""
* commit '
d6984958c38b202d47cdce002429006d5a8ede9e':
Revert "Correct the OBEX OPP Profile version"
Wei Wang [Thu, 4 Dec 2014 21:47:37 +0000 (21:47 +0000)]
am
e608a529: Merge "Remove unnecessary check of multiple advertise instance count." into lmp-mr1-dev
* commit '
e608a529718bb64accdf9f18cb196a9a3c45c90e':
Remove unnecessary check of multiple advertise instance count.
Andre Eisenbach [Thu, 4 Dec 2014 21:37:25 +0000 (21:37 +0000)]
am
cf7f6a15: Prevent Java call for acquiring already held wakelock
* commit '
cf7f6a154aed48659260d391994dc59151be937b':
Prevent Java call for acquiring already held wakelock
Matthew Xie [Thu, 4 Dec 2014 20:46:11 +0000 (20:46 +0000)]
am
5faeaa87: am
8a75ab5b: Merge "PAN TAP fd is not monitored in all cases" into lmp-mr1-dev
* commit '
5faeaa8755679cef4d4aa529db813973b7f59380':
PAN TAP fd is not monitored in all cases
Matthew Xie [Thu, 4 Dec 2014 20:25:02 +0000 (20:25 +0000)]
am
8a75ab5b: Merge "PAN TAP fd is not monitored in all cases" into lmp-mr1-dev
* commit '
8a75ab5b918c4e65e1b8fe55ec193b047ddfcb06':
PAN TAP fd is not monitored in all cases
Matthew Xie [Thu, 4 Dec 2014 19:53:02 +0000 (19:53 +0000)]
Merge "Revert "Correct the OBEX OPP Profile version""
Matthew Xie [Thu, 4 Dec 2014 07:59:14 +0000 (23:59 -0800)]
resolved conflicts for merge of
3c70ace5 to master
Change-Id: I58e5d99e8caa7775b075ac5e149535cb935229ee
Wei Wang [Thu, 4 Dec 2014 01:42:56 +0000 (01:42 +0000)]
Merge "Remove unnecessary check of multiple advertise instance count." into lmp-mr1-dev
Andre Eisenbach [Wed, 3 Dec 2014 18:35:53 +0000 (10:35 -0800)]
Prevent Java call for acquiring already held wakelock
Change-Id: Icf455b6aa7c0c1bf7abf7ea9700cfde17f6c7c2b
Matthew Xie [Wed, 3 Dec 2014 22:15:11 +0000 (22:15 +0000)]
Merge "PAN TAP fd is not monitored in all cases" into lmp-mr1-dev
Matthew Xie [Wed, 3 Dec 2014 20:42:06 +0000 (20:42 +0000)]
am
26d5c34a: Merge "Make GKI_TIMER_INTERVAL_FOR_WAKELOCK configurable for different target" into lmp-mr1-dev
* commit '
26d5c34af44bd1d5b430d15f3ac0942108159542':
Make GKI_TIMER_INTERVAL_FOR_WAKELOCK configurable for different target
Matthew Xie [Wed, 3 Dec 2014 04:18:03 +0000 (04:18 +0000)]
Merge "Make GKI_TIMER_INTERVAL_FOR_WAKELOCK configurable for different target" into lmp-mr1-dev
Matthew Xie [Wed, 3 Dec 2014 01:06:03 +0000 (17:06 -0800)]
Make GKI_TIMER_INTERVAL_FOR_WAKELOCK configurable for different target
Set the default value as 3000 ms
Bug:
18549150
Change-Id: I1d5b4fca627c22fdd8a32a41d5beac6837b6dff4
Andre Eisenbach [Tue, 2 Dec 2014 08:24:21 +0000 (08:24 +0000)]
am
d0f99244: am
e79be3d6: Add server-side callback for change in MTU (2/4)
* commit '
d0f99244a8fef1c25444ee3fd1bc2cd417a1b33e':
Add server-side callback for change in MTU (2/4)
Andre Eisenbach [Tue, 2 Dec 2014 08:14:17 +0000 (08:14 +0000)]
am
e79be3d6: Add server-side callback for change in MTU (2/4)
* commit '
e79be3d6ca41ed6349012c73a3374aca3714a053':
Add server-side callback for change in MTU (2/4)
Andre Eisenbach [Wed, 26 Nov 2014 20:56:55 +0000 (12:56 -0800)]
Add server-side callback for change in MTU (2/4)
When a client requests to update the LE transport MTU, the server
currently does not get notified and can therefor not properly size
notifications appropriate to the current MTU.
Bug:
18388114
Change-Id: Ice355f8919d4f69876574df1d90ce7d31f42bc4f
Wei Wang [Wed, 26 Nov 2014 20:47:49 +0000 (12:47 -0800)]
Remove unnecessary check of multiple advertise instance count.
Bug:
18539121
Change-Id: I841e4323ed4995bd9f8117681a759f52995d071f
Simon Wilson [Wed, 26 Nov 2014 19:57:34 +0000 (19:57 +0000)]
am
2bd9734e: am
2ffda316: am
254b5ba2: gki_buffer: add missing mutex unlock
* commit '
2bd9734ef17616d1352538047f2d71efa5692d65':
gki_buffer: add missing mutex unlock
Simon Wilson [Wed, 26 Nov 2014 18:41:47 +0000 (18:41 +0000)]
am
2ffda316: am
254b5ba2: gki_buffer: add missing mutex unlock
* commit '
2ffda316fc98f98eb7833006bd97a9e7686b6ba3':
gki_buffer: add missing mutex unlock
Zhenye Zhu [Tue, 25 Nov 2014 23:51:07 +0000 (15:51 -0800)]
PAN TAP fd is not monitored in all cases
Bug:
18271987
Change-Id: I348f3851a955b5277e7cdf0102583eaaef2ef0f3
Simon Wilson [Wed, 26 Nov 2014 00:59:38 +0000 (00:59 +0000)]
am
254b5ba2: gki_buffer: add missing mutex unlock
* commit '
254b5ba2e3f4c44b82a0369579b66bafcd0d6aa2':
gki_buffer: add missing mutex unlock
Simon Wilson [Tue, 25 Nov 2014 22:11:29 +0000 (14:11 -0800)]
gki_buffer: add missing mutex unlock
Bug:
18511282
Change-Id: Iea5248d5c9ba8690d0c2f462ec04784476309797
Matthew Xie [Tue, 25 Nov 2014 17:48:07 +0000 (17:48 +0000)]
am
b5a1e48e: am
c113e4db: Merge "Enforce Authentication for incoming HID connection" into lmp-mr1-dev
* commit '
b5a1e48e9476df8c25f0c3bc88fa9bce447695e4':
Enforce Authentication for incoming HID connection
Matthew Xie [Tue, 25 Nov 2014 17:39:31 +0000 (17:39 +0000)]
am
c113e4db: Merge "Enforce Authentication for incoming HID connection" into lmp-mr1-dev
* commit '
c113e4db5218901b7ef4b09b1f08727da70971e1':
Enforce Authentication for incoming HID connection
Matthew Xie [Mon, 24 Nov 2014 20:34:18 +0000 (20:34 +0000)]
Merge "Enforce Authentication for incoming HID connection" into lmp-mr1-dev
Simon Wilson [Sat, 22 Nov 2014 02:47:56 +0000 (02:47 +0000)]
am
2817cad3: (-s ours) am
a99c2d91: am
654c376f: DO NOT MERGE Reduce TIMER_INTERVAL_FOR_WAKELOCK_IN_MS to 100ms
* commit '
2817cad319f01bca3c63294e21e7796a2bae6e96':
DO NOT MERGE Reduce TIMER_INTERVAL_FOR_WAKELOCK_IN_MS to 100ms
Simon Wilson [Sat, 22 Nov 2014 02:35:28 +0000 (02:35 +0000)]
am
a99c2d91: am
654c376f: DO NOT MERGE Reduce TIMER_INTERVAL_FOR_WAKELOCK_IN_MS to 100ms
* commit '
a99c2d913308b0fe17324225d62936c009ed1e4e':
DO NOT MERGE Reduce TIMER_INTERVAL_FOR_WAKELOCK_IN_MS to 100ms
Simon Wilson [Sat, 22 Nov 2014 00:24:57 +0000 (00:24 +0000)]
am
654c376f: DO NOT MERGE Reduce TIMER_INTERVAL_FOR_WAKELOCK_IN_MS to 100ms
* commit '
654c376fda3035af5b9090edc2a0a32382baf21c':
DO NOT MERGE Reduce TIMER_INTERVAL_FOR_WAKELOCK_IN_MS to 100ms
Simon Wilson [Fri, 21 Nov 2014 17:37:49 +0000 (09:37 -0800)]
DO NOT MERGE Reduce TIMER_INTERVAL_FOR_WAKELOCK_IN_MS to 100ms
The bluedroid wakelock locked time has increased 2.5x since K.
Reduce the 3s interval to reduce the time that the wakelock is
held, allowing the kernel to suspend more frequently. By
reducing this, wakelock usage returns to roughly K levels.
This in turn reduces BT process power usage.
Bug:
18357273
Change-Id: I7c3bddffafb0fa59468b8dd5718220be8ac85506
Satya Calloji [Thu, 20 Nov 2014 21:13:24 +0000 (21:13 +0000)]
am
c28dac0b: Clean up SetADV and ScanResp data memory leak. automerge:
3770c47
* commit '
c28dac0bbd8d7d090bf96d9e18ad28cfcba39806':
Clean up SetADV and ScanResp data memory leak.
Satya Calloji [Thu, 20 Nov 2014 21:08:27 +0000 (21:08 +0000)]
Clean up SetADV and ScanResp data memory leak.
automerge:
3770c47
* commit '
3770c47387d3dfc6d2e2d32f4409a82119e726e3':
Clean up SetADV and ScanResp data memory leak.
Satya Calloji [Mon, 20 Oct 2014 04:28:46 +0000 (21:28 -0700)]
Clean up SetADV and ScanResp data memory leak.
Bug:
18045480
Change-Id: Ic433f4aa26bd08e84c53c447be9d5278e16ebd55
Andre Eisenbach [Wed, 19 Nov 2014 18:05:51 +0000 (18:05 +0000)]
am
22adf429: am
26fa02b5: LE: Use LE specific I/O capabilities
* commit '
22adf4291b6d290a9dc3072e41977dc726d84861':
LE: Use LE specific I/O capabilities
Andre Eisenbach [Wed, 19 Nov 2014 17:57:14 +0000 (17:57 +0000)]
am
26fa02b5: LE: Use LE specific I/O capabilities
* commit '
26fa02b5cc684f8675d80b61185a4e5ccf3c6a2a':
LE: Use LE specific I/O capabilities
Chih-hung Hsieh [Wed, 19 Nov 2014 00:28:50 +0000 (00:28 +0000)]
am
ec745b04: am
51dcba7a: Merge "Disable some clang warnings"
* commit '
ec745b04ebb65983f62e8f8e81fbb644824b53d7':
Disable some clang warnings
Chih-hung Hsieh [Wed, 19 Nov 2014 00:21:48 +0000 (00:21 +0000)]
am
51dcba7a: Merge "Disable some clang warnings"
* commit '
51dcba7a9a9860eb1f6a44ae268cbf24e3411694':
Disable some clang warnings
Chih-hung Hsieh [Tue, 18 Nov 2014 23:49:46 +0000 (23:49 +0000)]
Merge "Disable some clang warnings"
Andre Eisenbach [Tue, 18 Nov 2014 20:21:18 +0000 (20:21 +0000)]
am
2d20d13a: (-s ours) am
6cdf40af: am
a59f47f2: DO NOT MERGE Remove overflow rate limiting when reading A2DP frames
* commit '
2d20d13a091d0594616e6fc53aed4bd1e74f2bfc':
DO NOT MERGE Remove overflow rate limiting when reading A2DP frames
Matthew Xie [Tue, 18 Nov 2014 20:18:18 +0000 (20:18 +0000)]
am
23343441: am
86f97eda: Use the device type from saved properties instead of assuming default
* commit '
2334344102581597532dbb6cff5c921091ce7754':
Use the device type from saved properties instead of assuming default
Andre Eisenbach [Tue, 18 Nov 2014 20:18:18 +0000 (20:18 +0000)]
am
bda59f88: am
c5916e97: Remove overflow rate limiting when reading A2DP frames
* commit '
bda59f88101f39f82bb81a0d21e8ca1f73d36e4f':
Remove overflow rate limiting when reading A2DP frames
Andre Eisenbach [Tue, 18 Nov 2014 17:39:00 +0000 (09:39 -0800)]
LE: Use LE specific I/O capabilities
In an attempt to make the I/O capability configuration more reasable and
overwritable per platform, the BR/EDR specific I/O capabilities were
used for LE. In SMP, the I/O capabilities flag is mapped differently,
thus a separate flag is required to configure the LE I/O capabilities.
Bug:
18245986
Change-Id: I6b4ba8f8a1d60ea25729e49d305e3653e94928c6
Andre Eisenbach [Tue, 18 Nov 2014 17:24:16 +0000 (17:24 +0000)]
am
6cdf40af: am
a59f47f2: DO NOT MERGE Remove overflow rate limiting when reading A2DP frames
* commit '
6cdf40afc2e3cdfccde289bd784b49150ac9b07b':
DO NOT MERGE Remove overflow rate limiting when reading A2DP frames
Andre Eisenbach [Tue, 18 Nov 2014 17:15:26 +0000 (17:15 +0000)]
am
a59f47f2: DO NOT MERGE Remove overflow rate limiting when reading A2DP frames
* commit '
a59f47f27b2962828afd8d90d1a1d21206e32324':
DO NOT MERGE Remove overflow rate limiting when reading A2DP frames
Matthew Xie [Tue, 18 Nov 2014 02:08:30 +0000 (02:08 +0000)]
am
86f97eda: Use the device type from saved properties instead of assuming default
* commit '
86f97eda524568f2d264186844450db5e56dac36':
Use the device type from saved properties instead of assuming default
Andre Eisenbach [Tue, 18 Nov 2014 02:07:29 +0000 (02:07 +0000)]
am
c5916e97: Remove overflow rate limiting when reading A2DP frames
* commit '
c5916e97384f07ec5a2e061e6af24f70107c74a2':
Remove overflow rate limiting when reading A2DP frames
Priti Aghera [Wed, 12 Nov 2014 18:28:35 +0000 (10:28 -0800)]
Enforce Authentication for incoming HID connection
Enforce Authentication in addition to encryption for all incoming
HID connections.
Bug
17887668
Change-Id: Ib0d6cd6d8e793823c541a1b4468dcce89f297181
(cherry picked from commit
6d6502909c1dd1766db1fea2cb638866e137a7bf)
Matthew Xie [Mon, 10 Nov 2014 18:24:46 +0000 (10:24 -0800)]
Use the device type from saved properties instead of assuming default
DUMO device can do both BLE and BREDR operations. It was wrong
to assign BLE or BREDR type to it.
Bug:
18275230
Change-Id: I8d6c17e5157ba29a1af459629de9e2d6f6dc5e99
Andre Eisenbach [Fri, 7 Nov 2014 23:46:04 +0000 (15:46 -0800)]
DO NOT MERGE Remove overflow rate limiting when reading A2DP frames
A2DP now supports adjusting the number of A2DP frames sent per timer
tick to adjust for timer drift and missed media task ticks. When the
signal to the headset/speakers becomes interrupted, the number of
packets to be read can queue up and rate limiting will not allow for the
queue to be cleared.
The overflow mechanism introduced in commit
4aebca4 will cause the media
task to stop sending packets completely, which can underflow the jutter
buffer on the remote device and lead to audio drop-outs.
This patch removes the overflow mechanism and also adds code do discard
audio frames that could not be sent to the remote device (weak signal
etc) to allow the device to stay in sync and not build up audio delays.
Also added additional debug logging and changed the UIPC flush mechanism
to address an issue where reading byte by byte causes an endless flush
loop if remote UIPC producer writes data faster than the flush loop
consumes it.
Bug:
18244205
Change-Id: I9a424984806bb2a464877399804b3355b2c439c3
(cherry picked from commit
c5916e97384f07ec5a2e061e6af24f70107c74a2)
Andre Eisenbach [Fri, 7 Nov 2014 23:46:04 +0000 (15:46 -0800)]
Remove overflow rate limiting when reading A2DP frames
A2DP now supports adjusting the number of A2DP frames sent per timer
tick to adjust for timer drift and missed media task ticks. When the
signal to the headset/speakers becomes interrupted, the number of
packets to be read can queue up and rate limiting will not allow for the
queue to be cleared.
The overflow mechanism introduced in commit
4aebca4 will cause the media
task to stop sending packets completely, which can underflow the jutter
buffer on the remote device and lead to audio drop-outs.
This patch removes the overflow mechanism and also adds code do discard
audio frames that could not be sent to the remote device (weak signal
etc) to allow the device to stay in sync and not build up audio delays.
Also added additional debug logging and changed the UIPC flush mechanism
to address an issue where reading byte by byte causes an endless flush
loop if remote UIPC producer writes data faster than the flush loop
consumes it.
Bug:
18326405
Change-Id: I9a424984806bb2a464877399804b3355b2c439c3
Bernhard Rosenkränzer [Wed, 12 Nov 2014 21:11:31 +0000 (22:11 +0100)]
Disable some clang warnings
Disable some clang warnings that can't be fixed in the code easily.
The gnu-variable-sized-type-not-at-end extension is used heavily to
allow adding members to a struct after a variably sized header.
constant-logical-operand is triggered by code in l2c_utils.c that looks
like the construct is correct in this use case.
Change-Id: I3ff8bf5b6deb7a5807dc200a50f33b2583abb9c0
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Chaojing Sun [Tue, 11 Nov 2014 22:31:36 +0000 (22:31 +0000)]
Bluetooth fails to turn off with keyboard and headset connected automerge:
c5cda81
automerge:
e5b3f48
* commit '
e5b3f48a06dba6656bea01b6feec7a28909591ad':
Bluetooth fails to turn off with keyboard and headset connected
Chaojing Sun [Tue, 11 Nov 2014 22:08:45 +0000 (22:08 +0000)]
Bluetooth fails to turn off with keyboard and headset connected
automerge:
c5cda81
* commit '
c5cda8198541888a6f16795effa55a0d3254afdb':
Bluetooth fails to turn off with keyboard and headset connected
Chaojing Sun [Sat, 8 Nov 2014 00:42:46 +0000 (16:42 -0800)]
Bluetooth fails to turn off with keyboard and headset connected
When HOGP keyboard is connecting and BT off is requested, if there
is any HOGP data that was received during this state, it causes the
following side-effects:
- LE data was not thrown away in disconnecting state, instead it is
now being used as indication of link establishement
-The above triggers the link open callback for fix channel and
causes the BT off failure.
Check L2CAP link state and always discard the fixed channel data
received in disconnecting state solves the problem.
Bug:
17793437
Change-Id: I633d5e6346e952daa2abd642effad2f260954fdf
Satya Calloji [Fri, 7 Nov 2014 03:49:25 +0000 (03:49 +0000)]
am
068d6f9e: am
16451571: am
b407515f: Fix "no instances found for adv" when stop BLE scanning.
* commit '
068d6f9e9deacdb2be4a41d441b00165cb18f4fe':
Fix "no instances found for adv" when stop BLE scanning.
Satya Calloji [Fri, 7 Nov 2014 00:00:33 +0000 (00:00 +0000)]
am
16451571: am
b407515f: Fix "no instances found for adv" when stop BLE scanning.
* commit '
16451571a5461ab3be535d25cbb62ab03b6b6157':
Fix "no instances found for adv" when stop BLE scanning.
Satya Calloji [Thu, 6 Nov 2014 20:33:53 +0000 (20:33 +0000)]
am
b407515f: Fix "no instances found for adv" when stop BLE scanning.
* commit '
b407515ffa145b1a2cab01467da03c92aeb0e8eb':
Fix "no instances found for adv" when stop BLE scanning.
Satya Calloji [Fri, 10 Oct 2014 18:31:03 +0000 (11:31 -0700)]
Fix "no instances found for adv" when stop BLE scanning.
Bug:
17703806
Change-Id: I103d3637ad38d33b4370850a300b0d72bdaeb562
Andre Eisenbach [Wed, 5 Nov 2014 00:05:32 +0000 (00:05 +0000)]
am
d2a1baa1: am
cd4c3709: am
2933de99: am
f37767a1: HOGP: Do not remove device from whitelist on encryption failure
* commit '
d2a1baa1002a7dcfba8d2484a09984a009757fea':
HOGP: Do not remove device from whitelist on encryption failure
Andre Eisenbach [Wed, 5 Nov 2014 00:00:53 +0000 (00:00 +0000)]
am
cd4c3709: am
2933de99: am
f37767a1: HOGP: Do not remove device from whitelist on encryption failure
* commit '
cd4c370976faeab63083e49c0dec6664d08fd59c':
HOGP: Do not remove device from whitelist on encryption failure
Andre Eisenbach [Tue, 4 Nov 2014 23:49:36 +0000 (23:49 +0000)]
am
2933de99: am
f37767a1: HOGP: Do not remove device from whitelist on encryption failure
* commit '
2933de995b21b8ae2ed6d6b682823f49aea8fa5e':
HOGP: Do not remove device from whitelist on encryption failure
Andre Eisenbach [Tue, 4 Nov 2014 23:45:15 +0000 (23:45 +0000)]
am
f37767a1: HOGP: Do not remove device from whitelist on encryption failure
* commit '
f37767a17b2d80828f7ac4fa170859cb9e2f0bc6':
HOGP: Do not remove device from whitelist on encryption failure
Andre Eisenbach [Tue, 4 Nov 2014 23:23:02 +0000 (15:23 -0800)]
HOGP: Do not remove device from whitelist on encryption failure
If the encryption times out during the re-connect process for a HOGP
device, the device is removed from the whitelist and thus will not
reconnect until it is added back to the list. On platforms that do not
have a way to reconnect to a device manually, this means the device will
never reconnect again until the stack is restarted.
This patch checks the reason for the encryption failure and does not
remove the device from the whitelist if the encryption failed to a non
authentication/key related error.
Bug:
18233442
Change-Id: Ifaec4a9224ff9281956715b38d34c2d7c3fecb01
Matthew Xie [Tue, 4 Nov 2014 02:55:04 +0000 (02:55 +0000)]
am
928bbf51: (-s ours) am
b357f271: am
e50c7933: DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2 automerge:
595bcb4 -s ours automerge:
2369935 -s ours automerge:
0570fd9 -s ours
* commit '
928bbf51d57242edf67176ad754f717890b71431':
Matthew Xie [Tue, 4 Nov 2014 02:55:03 +0000 (02:55 +0000)]
am
63052540: am
122622f9: am
87303c76: Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag automerge:
98ad505 automerge:
f81ffdb automerge:
6d11a01
* commit '
63052540306dd4738899b4d449ef7e0fa2eaf144':
Matthew Xie [Tue, 4 Nov 2014 02:49:21 +0000 (02:49 +0000)]
am
b357f271: am
e50c7933: DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2 automerge:
595bcb4 -s ours automerge:
2369935 -s ours automerge:
0570fd9 -s ours
* commit '
b357f2716532f878be85ffb639b9c1ea2a6d3048':
Matthew Xie [Tue, 4 Nov 2014 02:49:21 +0000 (02:49 +0000)]
am
122622f9: am
87303c76: Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag automerge:
98ad505 automerge:
f81ffdb automerge:
6d11a01
* commit '
122622f97c7e020deb223843792a386282e99337':
Matthew Xie [Tue, 4 Nov 2014 00:19:18 +0000 (00:19 +0000)]
am
e50c7933: DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2 automerge:
595bcb4 -s ours automerge:
2369935 -s ours
automerge:
0570fd9 -s ours
* commit '
0570fd9c9cf0929140e8d16ebe78a5189f8b01bb':
Matthew Xie [Tue, 4 Nov 2014 00:19:14 +0000 (00:19 +0000)]
am
87303c76: Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag automerge:
98ad505 automerge:
f81ffdb
automerge:
6d11a01
* commit '
6d11a01aa3770a3b23086f08c9691617bb0c9578':
Simon Wilson [Mon, 3 Nov 2014 23:10:00 +0000 (23:10 +0000)]
am
b3cebcbc: am
020cccca: am
5fe98634: am
ba2f6d99: Revert "anthias:
17614185:Bluetooth: Getbuf returning invalid buffer pointer" automerge:
8403c6d
automerge:
fd3e332
* commit '
fd3e33296c5fec073109d7b6200302ba5809311a':
Mallikarjuna GB [Mon, 3 Nov 2014 22:50:21 +0000 (22:50 +0000)]
am
aa7a28a3: am
36eac517: am
27c93b25: am
46bfe63d: DO NOT MERGE AVRCP: Proper handling of Fragmented AVCTP packet automerge:
f9336d3 -s ours
automerge:
4504e77 -s ours
* commit '
4504e778983c024c51b2a74cc039ff6e7e7608ad':
Maggie_Lee [Mon, 3 Nov 2014 22:50:19 +0000 (22:50 +0000)]
am
9e7ad87f: am
9624c4d6: am
36ba410e: am
c1ccb0d9: anthias:
17614185:Bluetooth: Getbuf returning invalid buffer pointer automerge:
0e74efe
automerge:
efe6d10
* commit '
efe6d107f91a5bfce2e6595cdaf51a934e9bee05':
Simon Wilson [Mon, 3 Nov 2014 22:34:40 +0000 (22:34 +0000)]
am
b3cebcbc: am
020cccca: am
5fe98634: am
ba2f6d99: Revert "anthias:
17614185:Bluetooth: Getbuf returning invalid buffer pointer" automerge:
8403c6d
* commit '
b3cebcbc353eab5b4920f1ccf69b69560b636e93':
Mallikarjuna GB [Mon, 3 Nov 2014 22:31:58 +0000 (22:31 +0000)]
am
aa7a28a3: am
36eac517: am
27c93b25: am
46bfe63d: DO NOT MERGE AVRCP: Proper handling of Fragmented AVCTP packet automerge:
f9336d3 -s ours
* commit '
aa7a28a3efe8e48f80c4ecf0c8b7ee0cbe275877':
Maggie_Lee [Mon, 3 Nov 2014 22:31:57 +0000 (22:31 +0000)]
am
9e7ad87f: am
9624c4d6: am
36ba410e: am
c1ccb0d9: anthias:
17614185:Bluetooth: Getbuf returning invalid buffer pointer automerge:
0e74efe
* commit '
9e7ad87f5ed2ca9591fbd56e30657063f76fd04e':
Matthew Xie [Mon, 3 Nov 2014 21:20:45 +0000 (21:20 +0000)]
am
e50c7933: DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2 automerge:
595bcb4 -s ours automerge:
2369935 -s ours
* commit '
e50c79337277f9da2c9cef52fd373bbc85df6255':
Matthew Xie [Mon, 3 Nov 2014 21:20:44 +0000 (21:20 +0000)]
am
87303c76: Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag automerge:
98ad505 automerge:
f81ffdb
* commit '
87303c76d7e472818b3379475241191cd2b3e3aa':
Matthew Xie [Mon, 3 Nov 2014 21:13:49 +0000 (21:13 +0000)]
DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2 automerge:
595bcb4 -s ours
automerge:
2369935 -s ours
* commit '
236993560aad078736afd36323ed0dafa13005c2':
Matthew Xie [Mon, 3 Nov 2014 21:13:21 +0000 (21:13 +0000)]
Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag automerge:
98ad505
automerge:
f81ffdb
* commit '
f81ffdb1804dfe759c6a67cfc40a7c4fb599b127':
Simon Wilson [Mon, 3 Nov 2014 20:56:14 +0000 (20:56 +0000)]
am
020cccca: am
5fe98634: am
ba2f6d99: Revert "anthias:
17614185:Bluetooth: Getbuf returning invalid buffer pointer" automerge:
8403c6d
* commit '
020ccccabd8bfb7bb863433a86793d3df6c32ed5':
Simon Wilson [Mon, 3 Nov 2014 20:47:29 +0000 (20:47 +0000)]
am
5fe98634: am
ba2f6d99: Revert "anthias:
17614185:Bluetooth: Getbuf returning invalid buffer pointer" automerge:
8403c6d
* commit '
5fe98634c3bd19660d2f3533f83b9beca15a94ab':
Simon Wilson [Mon, 3 Nov 2014 20:40:34 +0000 (20:40 +0000)]
am
ba2f6d99: Revert "anthias:
17614185:Bluetooth: Getbuf returning invalid buffer pointer"
automerge:
8403c6d
* commit '
8403c6d2a012adf87bed9d34176bfaa6a343463c':
Mallikarjuna GB [Mon, 3 Nov 2014 20:37:52 +0000 (20:37 +0000)]
am
36eac517: am
27c93b25: am
46bfe63d: DO NOT MERGE AVRCP: Proper handling of Fragmented AVCTP packet automerge:
f9336d3 -s ours
* commit '
36eac517f8ac4220315673fb9fbe172ae5430c7d':
Maggie_Lee [Mon, 3 Nov 2014 20:37:51 +0000 (20:37 +0000)]
am
9624c4d6: am
36ba410e: am
c1ccb0d9: anthias:
17614185:Bluetooth: Getbuf returning invalid buffer pointer automerge:
0e74efe
* commit '
9624c4d6ee066ffc70c9f920b073dafecfb81b8e':
Mallikarjuna GB [Mon, 3 Nov 2014 20:29:47 +0000 (20:29 +0000)]
am
27c93b25: am
46bfe63d: DO NOT MERGE AVRCP: Proper handling of Fragmented AVCTP packet automerge:
f9336d3 -s ours
* commit '
27c93b253feaea8f5144d3e8957478575c4df13c':
Maggie_Lee [Mon, 3 Nov 2014 20:29:46 +0000 (20:29 +0000)]
am
36ba410e: am
c1ccb0d9: anthias:
17614185:Bluetooth: Getbuf returning invalid buffer pointer automerge:
0e74efe
* commit '
36ba410e35e924aad27cd6556e2346af5e606363':
Mallikarjuna GB [Mon, 3 Nov 2014 20:20:07 +0000 (20:20 +0000)]
am
46bfe63d: DO NOT MERGE AVRCP: Proper handling of Fragmented AVCTP packet
automerge:
f9336d3 -s ours
* commit '
f9336d34b5168d4c97476ea88dad586d481c8397':
Maggie_Lee [Mon, 3 Nov 2014 20:20:03 +0000 (20:20 +0000)]
am
c1ccb0d9: anthias:
17614185:Bluetooth: Getbuf returning invalid buffer pointer
automerge:
0e74efe
* commit '
0e74efe56b678c85f35e158a40d9828661cfa2d4':
Eric Laurent [Fri, 31 Oct 2014 00:24:22 +0000 (00:24 +0000)]
am
ade2c70e: am
59f80103: Merge "audio HAL: remove misleading error log" into lmp-mr1-dev
* commit '
ade2c70e3a46e5f1c189eb3cf1e7311605d619f8':
audio HAL: remove misleading error log
Eric Laurent [Fri, 31 Oct 2014 00:16:41 +0000 (00:16 +0000)]
am
59f80103: Merge "audio HAL: remove misleading error log" into lmp-mr1-dev
* commit '
59f801031d9d28aa65ecffbefb40f23b255b082d':
audio HAL: remove misleading error log
Prerepa Viswanadham [Thu, 30 Oct 2014 19:05:59 +0000 (19:05 +0000)]
am
cf359a5c: am
903285cb: am
472c2a7b: Don\'t starve a BT ACL link with 0 xmit quota automerge:
3a14106
* commit '
cf359a5c4fa891355f8c5ea373fcb49af0cc4f6d':
Don't starve a BT ACL link with 0 xmit quota
Prerepa Viswanadham [Thu, 30 Oct 2014 19:01:32 +0000 (19:01 +0000)]
am
903285cb: am
472c2a7b: Don\'t starve a BT ACL link with 0 xmit quota
automerge:
3a14106
* commit '
3a14106e20be86c3abe496e6d36a0b6e67e52c38':
Don't starve a BT ACL link with 0 xmit quota
Eric Laurent [Thu, 30 Oct 2014 16:03:11 +0000 (16:03 +0000)]
Merge "audio HAL: remove misleading error log" into lmp-mr1-dev