GitLab

am 0a8c803a: am 7f34538a: (-s ours) am 65aec3a3: am 6d429d9d: (-s ours) am 3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default

* commit '0a8c803a':
  DO NOT MERGE Change pairing_cb to assume temporary pairing by default

am 7f34538a: (-s ours) am 65aec3a3: am 6d429d9d: (-s ours) am 3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default

* commit '7f34538a':
  DO NOT MERGE Change pairing_cb to assume temporary pairing by default

am 65aec3a3: am 6d429d9d: (-s ours) am 3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default

* commit '65aec3a3':
  DO NOT MERGE Change pairing_cb to assume temporary pairing by default

am 408dec19: am 977acabd: (-s ours) am eebc8ab9: DO NOT MERGE Change pairing_cb to assume temporary pairing by default

* commit '408dec19':
  DO NOT MERGE Change pairing_cb to assume temporary pairing by default

am 977acabd: (-s ours) am eebc8ab9: DO NOT MERGE Change pairing_cb to assume temporary pairing by default

* commit '977acabd':
  DO NOT MERGE Change pairing_cb to assume temporary pairing by default

am 6d429d9d: (-s ours) am 3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default

* commit '6d429d9d':
  DO NOT MERGE Change pairing_cb to assume temporary pairing by default

* commit 'eebc8ab9':
  DO NOT MERGE Change pairing_cb to assume temporary pairing by default

* commit '3efb9e2e':
  DO NOT MERGE Change pairing_cb to assume temporary pairing by default

* commit 'a708936d':
  DO NOT MERGE Change pairing_cb to assume temporary pairing by default

When pairing takes place, the pairing_cb.is_temp flag indicates whether
a pairing is temporary or permanent. Link keys are not stored for
temporary pairings. Since this is a "positive" flag, resetting the
pairing_cb control block (ex. memset to 0), it will assume persistent
pairing by default. Under certain circumstances, this can lead to a link
key being stored for temporarily secured connection.

This patch reverses the flag to be a "negative" flag. Renamed to
"persistent_bond", the default 0 meaning is now used to indicate a
temporary bond. If the lag is not properly set now, it will default to a
temporary bond and will not save the link key erronously.

Bug: 18345373
Change-Id: I06b1ba9331a70ebc29f4437bf836164658dec5ae

When pairing takes place, the pairing_cb.is_temp flag indicates whether
a pairing is temporary or permanent. Link keys are not stored for
temporary pairings. Since this is a "positive" flag, resetting the
pairing_cb control block (ex. memset to 0), it will assume persistent
pairing by default. Under certain circumstances, this can lead to a link
key being stored for temporarily secured connection.

This patch reverses the flag to be a "negative" flag. Renamed to
"persistent_bond", the default 0 meaning is now used to indicate a
temporary bond. If the lag is not properly set now, it will default to a
temporary bond and will not save the link key erronously.

Bug: 18345373
Change-Id: I8558abc9eace609b1ba02485b0ff775fb6f3c6af

When pairing takes place, the pairing_cb.is_temp flag indicates whether
a pairing is temporary or permanent. Link keys are not stored for
temporary pairings. Since this is a "positive" flag, resetting the
pairing_cb control block (ex. memset to 0), it will assume persistent
pairing by default. Under certain circumstances, this can lead to a link
key being stored for temporarily secured connection.

This patch reverses the flag to be a "negative" flag. Renamed to
"persistent_bond", the default 0 meaning is now used to indicate a
temporary bond. If the lag is not properly set now, it will default to a
temporary bond and will not save the link key erronously.

Bug: 18345373
Change-Id: Ifb61e7a23db07888a625db9ab851548600183136

Change-Id: Icf455b6aa7c0c1bf7abf7ea9700cfde17f6c7c2b

Bug: 18511282
Change-Id: Iea5248d5c9ba8690d0c2f462ec04784476309797

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

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 4aebca46 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 c5916e97)

Bug:17703806
Change-Id: I103d3637ad38d33b4370850a300b0d72bdaeb562

* commit 'f37767a1':
  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

am e50c7933: DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2 automerge: 595bcb4c  -s ours automerge: 23699356  -s ours

* commit 'e50c7933':

am 87303c76: Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag automerge: 98ad505f automerge: f81ffdb1

* commit '87303c76':

DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2 automerge: 595bcb4c  -s ours
automerge: 23699356  -s ours

* commit '23699356':

automerge: f81ffdb1

* commit 'f81ffdb1':

am 5fe98634: am ba2f6d99: Revert "anthias:17614185:Bluetooth: Getbuf returning invalid buffer pointer" automerge: 8403c6d2

* commit '5fe98634':

automerge: 8403c6d2

* commit '8403c6d2':

am 27c93b25: am 46bfe63d: DO NOT MERGE AVRCP: Proper handling of Fragmented AVCTP packet automerge: f9336d34  -s ours

* commit '27c93b25':

am 36ba410e: am c1ccb0d9: anthias:17614185:Bluetooth: Getbuf returning invalid buffer pointer automerge: 0e74efe5

* commit '36ba410e':

automerge: f9336d34  -s ours

* commit 'f9336d34':

automerge: 0e74efe5

* commit '0e74efe5':

* commit '472c2a7b':
  Don't starve a BT ACL link with 0 xmit quota

automerge: 595bcb4c  -s ours

* commit '595bcb4c':
  DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2

automerge: 98ad505f

* commit '98ad505f':
  Increment seq before adding to packet in avdt_scb_hdl_write_req_no_frag

With new link management of controller buffers between
different ACL connections, it is possible that a ACL
conn would get 0 buffers - thus no profile can run.
This affects classic and LE ACL connections.

This work around allows a floor of 1 buffer as the
floor for all connection, irrespective of controller
capability.

Bug: 17976311
Change-Id: I7cd0d34af47c441c5ea7f2b836b591a4fec62ad1

* commit '5e808468':
  LE: Do not remove bond on encryption failure

If the encryption fails during the re-connection process with a
previously paired LE device, the pairing is removed. Thus, a single
connection failure could lead to the device be unpaired.

This patch prevents unpairing when encryption fails.

Additionally, the IRK is restored from NV ram to fix reconnection to
dual-mode devices.

Bug: 18072300
Change-Id: I077a16d0715fdaa07b95b1c664c18bd839754896

* commit '433fe016':
  Cache HOGP HID report map

* commit '25249f76':
  Retry pairing if the device did not respond (page timeout)

* commit '01d102b3':
  A2DP: Lowering maximum PCM frame limit to avoid audio breaks

HID reports from a bonded device can be missed when Bluetooth is
restarted HOGP report discovery is still active. Caching the
report information and loading it back when the stack resets
will ensure incoming HID reports can be processed immediately.

Bug: 17999991
Change-Id: I4608935f8749537d6b05625b894445a21f844ee0