OSDN Git Service

android-x86/system-bt.git
8 years agoam d488c105: am 145348f4: am aa3be1a6: Implement Bluetooth settings factory reset...
Ajay Panicker [Wed, 5 Aug 2015 18:19:23 +0000 (18:19 +0000)]
am d488c105: am 145348f4: am aa3be1a6: Implement Bluetooth settings factory reset (3/5)

* commit 'd488c10543f95f018b05315269da1c2d49e0378e':
  Implement Bluetooth settings factory reset (3/5)

8 years agoam 145348f4: am aa3be1a6: Implement Bluetooth settings factory reset (3/5)
Ajay Panicker [Wed, 5 Aug 2015 18:03:32 +0000 (18:03 +0000)]
am 145348f4: am aa3be1a6: Implement Bluetooth settings factory reset (3/5)

* commit '145348f4ab9aa14bdfb87b9329783c3cb59c455e':
  Implement Bluetooth settings factory reset (3/5)

8 years agoam aa3be1a6: Implement Bluetooth settings factory reset (3/5)
Ajay Panicker [Wed, 5 Aug 2015 17:55:36 +0000 (17:55 +0000)]
am aa3be1a6: Implement Bluetooth settings factory reset (3/5)

* commit 'aa3be1a696b9ae1142fe9f358ad5f97e99da7892':
  Implement Bluetooth settings factory reset (3/5)

8 years agoImplement Bluetooth settings factory reset (3/5)
Ajay Panicker [Tue, 28 Jul 2015 23:54:53 +0000 (16:54 -0700)]
Implement Bluetooth settings factory reset (3/5)

Implemented the factory reset function to be used to reset all bluetooth
settings on device to factory default

Bug: 16161518

8 years agoam 80caab27: Drop obsolete libpower dependency.
Ian Coolidge [Wed, 5 Aug 2015 01:02:42 +0000 (01:02 +0000)]
am 80caab27: Drop obsolete libpower dependency.

* commit '80caab275a4a0daface9d970e5cbc28896b64af3':
  Drop obsolete libpower dependency.

8 years agoDrop obsolete libpower dependency.
Ian Coolidge [Fri, 31 Jul 2015 23:18:18 +0000 (16:18 -0700)]
Drop obsolete libpower dependency.

Wakelock activity is delegated to depending module.

Change-Id: I368bb9287f208fed3a674423e82fb2a8cb9e8268

8 years agoresolved conflicts for merge of 145cf576 to mnc-dr-dev-plus-aosp
Arman Uguray [Tue, 4 Aug 2015 22:46:25 +0000 (15:46 -0700)]
resolved conflicts for merge of 145cf576 to mnc-dr-dev-plus-aosp

Change-Id: I1452632bb670d639c5c2b4d07a3045b9ccaa88bd

8 years agoCompile libbtcore and libosi for host
Arman Uguray [Sat, 1 Aug 2015 02:14:39 +0000 (19:14 -0700)]
Compile libbtcore and libosi for host

The static libraries now also compile for a Linux host as libbtcore-host and
libosi-host. The unittests are compiled for the target against Bionic libc and
for the host against glibc.

Bug: 22884515
Change-Id: Iac1310a48cfd2ff43c356cb31165fd176d0e1d39

8 years agoam 3c0ea3e5: test_vendor_lib: Use EPOLLOUT
Dennis Cheng [Tue, 4 Aug 2015 18:37:50 +0000 (18:37 +0000)]
am 3c0ea3e5: test_vendor_lib: Use EPOLLOUT

* commit '3c0ea3e5a5aca269283854d8f2f584ad0699c951':
  test_vendor_lib: Use EPOLLOUT

8 years agotest_vendor_lib: Use EPOLLOUT
Dennis Cheng [Tue, 16 Jun 2015 19:44:55 +0000 (12:44 -0700)]
test_vendor_lib: Use EPOLLOUT

HciTransport checks for write-readiness before sending any packets
back to the HCI. Packets are maintained on a queue and only written
when the EPOLLOUT flag is set in the epoll_event.

Bug: 21586676
Change-Id: Iebd9599286b62746e2be7e424c522058ae978bb1

8 years agoam c41e90bd: am 68a34519: am d63f7c0b: Add Dialog mouse & KB to blacklist for LE...
Nitin Arora [Tue, 4 Aug 2015 17:01:30 +0000 (17:01 +0000)]
am c41e90bd: am 68a34519: am d63f7c0b: Add Dialog mouse & KB to blacklist for LE secure connections

* commit 'c41e90bda78f3948e5ec9f4bd21703fbd63e3054':
  Add Dialog mouse & KB to blacklist for LE secure connections

8 years agoam 6db7a648: am 02796552: am 84d13eda: Add an explicit check for AVRCP vendor data
Pavlin Radoslavov [Tue, 4 Aug 2015 17:01:29 +0000 (17:01 +0000)]
am 6db7a648: am 02796552: am 84d13eda: Add an explicit check for AVRCP vendor data

* commit '6db7a648d92bd3d5762c11d5fb0132f0f29f9e22':
  Add an explicit check for AVRCP vendor data

8 years agoam 68a34519: am d63f7c0b: Add Dialog mouse & KB to blacklist for LE secure connections
Nitin Arora [Tue, 4 Aug 2015 16:47:40 +0000 (16:47 +0000)]
am 68a34519: am d63f7c0b: Add Dialog mouse & KB to blacklist for LE secure connections

* commit '68a345192d4722677d868a6c296b8d5dcb712778':
  Add Dialog mouse & KB to blacklist for LE secure connections

8 years agoam 02796552: am 84d13eda: Add an explicit check for AVRCP vendor data
Pavlin Radoslavov [Tue, 4 Aug 2015 16:47:40 +0000 (16:47 +0000)]
am 02796552: am 84d13eda: Add an explicit check for AVRCP vendor data

* commit '02796552c480e62cd321b248f2b7b5f71b9389db':
  Add an explicit check for AVRCP vendor data

8 years agoam d63f7c0b: Add Dialog mouse & KB to blacklist for LE secure connections
Nitin Arora [Tue, 4 Aug 2015 16:39:38 +0000 (16:39 +0000)]
am d63f7c0b: Add Dialog mouse & KB to blacklist for LE secure connections

* commit 'd63f7c0b26057f650fd30526758cd259c0b3480a':
  Add Dialog mouse & KB to blacklist for LE secure connections

8 years agoam 84d13eda: Add an explicit check for AVRCP vendor data
Pavlin Radoslavov [Tue, 4 Aug 2015 16:39:36 +0000 (16:39 +0000)]
am 84d13eda: Add an explicit check for AVRCP vendor data

* commit '84d13edac39c51290e858a71fea58925db3844bc':
  Add an explicit check for AVRCP vendor data

8 years agoAdd Dialog mouse & KB to blacklist for LE secure connections
Nitin Arora [Tue, 28 Jul 2015 23:00:55 +0000 (16:00 -0700)]
Add Dialog mouse & KB to blacklist for LE secure connections

This change allows the host to mask the Cross key bit in
the key distribution fields of the pairing request and
response while pairing with the Dialog keyboard and mouse
to prevent the remote from rejecting the DUT's pairing request.

Bug: 22799966
Change-Id: I89420e77875957c78e915c508de311d779fd03df

8 years agoAdd an explicit check for AVRCP vendor data
Pavlin Radoslavov [Tue, 4 Aug 2015 16:05:39 +0000 (09:05 -0700)]
Add an explicit check for AVRCP vendor data

Add an explicit check for AVRCP vendor data when parsing received vendor
commands or responses.

Bug: 21768387
Change-Id: I715de6fc7348d063c448971a8dae6dd1b00c7062

8 years agoam b5081958: am 856fa1bc: am caaa00f5: Fix a crash for a race condition during Blueto...
Pavlin Radoslavov [Tue, 4 Aug 2015 05:54:02 +0000 (05:54 +0000)]
am b5081958: am 856fa1bc: am caaa00f5: Fix a crash for a race condition during Bluetooth shutdown

* commit 'b5081958a4b12be175077ad61700b91293f118f9':
  Fix a crash for a race condition during Bluetooth shutdown

8 years agoam 856fa1bc: am caaa00f5: Fix a crash for a race condition during Bluetooth shutdown
Pavlin Radoslavov [Tue, 4 Aug 2015 05:37:45 +0000 (05:37 +0000)]
am 856fa1bc: am caaa00f5: Fix a crash for a race condition during Bluetooth shutdown

* commit '856fa1bcef4a5f28c310294c187e9d54b66f2e1e':
  Fix a crash for a race condition during Bluetooth shutdown

8 years agoam caaa00f5: Fix a crash for a race condition during Bluetooth shutdown
Pavlin Radoslavov [Tue, 4 Aug 2015 05:31:09 +0000 (05:31 +0000)]
am caaa00f5: Fix a crash for a race condition during Bluetooth shutdown

* commit 'caaa00f5ede96461e11de866ac15f5224442d1eb':
  Fix a crash for a race condition during Bluetooth shutdown

8 years agoFix a crash for a race condition during Bluetooth shutdown
Pavlin Radoslavov [Tue, 4 Aug 2015 04:58:45 +0000 (21:58 -0700)]
Fix a crash for a race condition during Bluetooth shutdown

This is same race condition observed in btif_media_task_aa_tx_flush_req()
because btif_media_task_aa_tx_flush_req() and btif_media_task_stop_aa_req()
are called back-to-bach.

This race condition is triggered when A2DP audio is streaming on shutdown:
"btif_a2dp_on_stopped() -> btif_media_task_stop_aa_req()" is called
to stop the particular audio stream, and this happens right after
the "cleanup() -> btif_a2dp_stop_media_task()" processing during
the shutdown of the Bluetooth stack.

Bug: 22700411
Change-Id: Ia0c98d44a108cf0f57731ac8129e4d76c9934542

8 years agoam 6f2cecf9: Merge "bluedroidtest: drop obsolete libhardware_legacy dependency."
Ian Coolidge [Mon, 3 Aug 2015 21:47:14 +0000 (21:47 +0000)]
am 6f2cecf9: Merge "bluedroidtest: drop obsolete libhardware_legacy dependency."

* commit '6f2cecf90691c44c0a7955fa765d55795bacb6e5':
  bluedroidtest: drop obsolete libhardware_legacy dependency.

8 years agoam f3b1820e: test_vendor_lib: Initial commit
Dennis Cheng [Mon, 3 Aug 2015 21:46:57 +0000 (21:46 +0000)]
am f3b1820e: test_vendor_lib: Initial commit

* commit 'f3b1820e1676261886a6537e1f6abac6a35ed6d4':
  test_vendor_lib: Initial commit

8 years agoMerge "bluedroidtest: drop obsolete libhardware_legacy dependency."
Ian Coolidge [Mon, 3 Aug 2015 20:45:39 +0000 (20:45 +0000)]
Merge "bluedroidtest: drop obsolete libhardware_legacy dependency."

8 years agobluedroidtest: drop obsolete libhardware_legacy dependency.
Ian Coolidge [Fri, 31 Jul 2015 22:36:07 +0000 (15:36 -0700)]
bluedroidtest: drop obsolete libhardware_legacy dependency.

Change-Id: Iecd7839aa52debb14c6fc10da2d7f838f8d05327

8 years agoam c6760d82: Provide --android-ipc-socket-suffix.
Ian Coolidge [Mon, 3 Aug 2015 18:02:00 +0000 (18:02 +0000)]
am c6760d82: Provide --android-ipc-socket-suffix.

* commit 'c6760d82357f46943406c579f5b1c291a20afdeb':
  Provide --android-ipc-socket-suffix.

8 years agotest_vendor_lib: Initial commit
Dennis Cheng [Tue, 16 Jun 2015 19:44:55 +0000 (12:44 -0700)]
test_vendor_lib: Initial commit

Basic vendor library for a test Bluetooth controller. Currently consists
of mostly stub functions and objects and can only handle the reset
command (by immediately responding with a command complete event).
Implemented through a global EventDispatcher object which waits for data
from the HCI and directly returns the appropriate response.

Eventually, the dispatcher will manage a fake controller object that
will provide callbacks to be executed whenever events are processed by
the dispatcher. Unit tests are still in progress and will be in the next
upload.

Bug: 21586676
Change-Id: I1c6746f8b0f1732b89a1da13facecdd49b5ac1b6

8 years agoam 053dcd6c: am cf92ded8: am 9de273d9: Fix CTS Verifier test for insecure RFCOMM...
Sharvil Nanavati [Sat, 1 Aug 2015 17:04:08 +0000 (17:04 +0000)]
am 053dcd6c: am cf92ded8: am 9de273d9: Fix CTS Verifier test for insecure RFCOMM connection.

* commit '053dcd6cce1f715fa10683f7c1a238bc921099a3':
  Fix CTS Verifier test for insecure RFCOMM connection.

8 years agoam cf92ded8: am 9de273d9: Fix CTS Verifier test for insecure RFCOMM connection.
Sharvil Nanavati [Sat, 1 Aug 2015 16:37:52 +0000 (16:37 +0000)]
am cf92ded8: am 9de273d9: Fix CTS Verifier test for insecure RFCOMM connection.

* commit 'cf92ded8275c25f63ac4d85a3720972dcdac0675':
  Fix CTS Verifier test for insecure RFCOMM connection.

8 years agoam fe65fb79: service: Refactor IPC and singletons
Arman Uguray [Sat, 1 Aug 2015 15:48:02 +0000 (15:48 +0000)]
am fe65fb79: service: Refactor IPC and singletons

* commit 'fe65fb7978bc9257a36d1e5eae59c5f412dbdb49':
  service: Refactor IPC and singletons

8 years agoam 9de273d9: Fix CTS Verifier test for insecure RFCOMM connection.
Sharvil Nanavati [Fri, 31 Jul 2015 23:42:06 +0000 (23:42 +0000)]
am 9de273d9: Fix CTS Verifier test for insecure RFCOMM connection.

* commit '9de273d9fb99b9f612b8acd50e09225f60444363':
  Fix CTS Verifier test for insecure RFCOMM connection.

8 years agoFix CTS Verifier test for insecure RFCOMM connection.
Sharvil Nanavati [Fri, 31 Jul 2015 21:22:08 +0000 (14:22 -0700)]
Fix CTS Verifier test for insecure RFCOMM connection.

Closing an RFCOMM server socket does not remove the corresponding
service record from the security database. However, the RFCOMM
channel becomes free for reuse. The next RFCOMM server socket will
therefore "inherit" the service record for the closed one if it
happens to reuse the same channel.

Bug: 22880207
Change-Id: Ida3fee49e5f40667d9992dc4c4442f9289adae9e

8 years agoProvide --android-ipc-socket-suffix.
Ian Coolidge [Fri, 31 Jul 2015 03:51:47 +0000 (20:51 -0700)]
Provide --android-ipc-socket-suffix.

This allows Android init to create a socket
for the service, and have consolidated access control.

Android init creates the socket and passes the FD through
an environment variable, so we must use OSI to decode it.

Bug: 22807533
Change-Id: I7ec0a14b8f3b44277ce99faad68623d6691f7863

8 years agoservice: Refactor IPC and singletons
Arman Uguray [Sat, 25 Jul 2015 02:14:42 +0000 (19:14 -0700)]
service: Refactor IPC and singletons

This CL makes the following major refactors to the system service code:

  1. A new global Daemon object is introduced, which manages the main event
  loop and all other subsystems of the Bluetooth daemon. This object is the only
  singleton class and initializes and owns everything else.

  2. Everything that was a singleton and/or was initialized directly in main.cpp
  is now a) no longer a singleton; b) now initialized and owned by the global
  Daemon instance.

  3. All of the Chromecast specific IPC code has been moved into the ipc/
  subdirectory. This directory is meant for everything that is IPC related,
  paving the way for enabling multiple IPC systems (domain-socket based, Binder
  based, etc) simultaneously in the future. Main changes to the Chromecast IPC
  code are:

      a. All files and classes have been renamed to reflect the
      UNIX-domain-socket-specific nature of the IPC mechanism.

      b. The code no longer hogs up the main thread while listening for
      connections. All of this logic has been moved to a dedicated thread with
      its own MessageLoopForIO, so that it can use the built-in mechanisms for
      polling on client sockets in the future.

Bug: 22532180
Change-Id: I42db06dba6cff3bc8f8101a1ea2b6787a69409fd

8 years agoam fd8fdca4: service: Add null initialization for new scan cb.
Ian Coolidge [Thu, 30 Jul 2015 21:31:37 +0000 (21:31 +0000)]
am fd8fdca4: service: Add null initialization for new scan cb.

* commit 'fd8fdca47afdcb797b35a05bc7bf57dd1ccbdca1':
  service: Add null initialization for new scan cb.

8 years agoservice: Add null initialization for new scan cb.
Ian Coolidge [Thu, 11 Jun 2015 03:34:43 +0000 (20:34 -0700)]
service: Add null initialization for new scan cb.

scan_parameter_setup_completed_cb was added to
btgatt_client_callbacks_t.

Change-Id: If0aa113df7cf3db742fa64244bbb7a849c877525

8 years agoam a63da87e: am 8bcdbb96: am efa5991f: Fix a NULL-pointer crash
Pavlin Radoslavov [Thu, 30 Jul 2015 01:18:03 +0000 (01:18 +0000)]
am a63da87e: am 8bcdbb96: am efa5991f: Fix a NULL-pointer crash

* commit 'a63da87e9082ac31fb7b33b6654114bba8c060b3':
  Fix a NULL-pointer crash

8 years agoam 8bcdbb96: am efa5991f: Fix a NULL-pointer crash
Pavlin Radoslavov [Thu, 30 Jul 2015 00:53:09 +0000 (00:53 +0000)]
am 8bcdbb96: am efa5991f: Fix a NULL-pointer crash

* commit '8bcdbb96e6b07ca0fc0b88b0cf847922f3090452':
  Fix a NULL-pointer crash

8 years agoam efa5991f: Fix a NULL-pointer crash
Pavlin Radoslavov [Thu, 30 Jul 2015 00:36:30 +0000 (00:36 +0000)]
am efa5991f: Fix a NULL-pointer crash

* commit 'efa5991fc7dc3b9b74b73966a4bf5cd5aad9f06a':
  Fix a NULL-pointer crash

8 years agoFix a NULL-pointer crash
Pavlin Radoslavov [Wed, 29 Jul 2015 23:52:47 +0000 (16:52 -0700)]
Fix a NULL-pointer crash

It seems that the current implementation of btm_sec_encrypt_change()
does not handle the case when it is called with an invalid handle,
such as inside file btu_hcif.c :

  case HCI_SET_CONN_ENCRYPTION:
    /* Device refused to start encryption. ... */
    btm_sec_encrypt_change(BTM_INVALID_HCI_HANDLE, ...)

Bug: 22791224

Change-Id: Ide9404d0c82819399cf258ae3f90c25b352f1e20

8 years agoam 3aaf435e: am 8214399e: am 48a4b9cd: Assign pseudo address for host-based RPA resol...
Andre Eisenbach [Wed, 29 Jul 2015 22:47:40 +0000 (22:47 +0000)]
am 3aaf435e: am 8214399e: am 48a4b9cd: Assign pseudo address for host-based RPA resolution matches

* commit '3aaf435e73b449d118dabd88f285eca5061847fe':
  Assign pseudo address for host-based RPA resolution matches

8 years agoam 8214399e: am 48a4b9cd: Assign pseudo address for host-based RPA resolution matches
Andre Eisenbach [Wed, 29 Jul 2015 22:21:15 +0000 (22:21 +0000)]
am 8214399e: am 48a4b9cd: Assign pseudo address for host-based RPA resolution matches

* commit '8214399e7f31d218eeb36b2880150de891b23b1c':
  Assign pseudo address for host-based RPA resolution matches

8 years agoam 48a4b9cd: Assign pseudo address for host-based RPA resolution matches
Andre Eisenbach [Wed, 29 Jul 2015 22:08:16 +0000 (22:08 +0000)]
am 48a4b9cd: Assign pseudo address for host-based RPA resolution matches

* commit '48a4b9cd18a306a45249898008c73f80fb3b9d48':
  Assign pseudo address for host-based RPA resolution matches

8 years agoAssign pseudo address for host-based RPA resolution matches
Andre Eisenbach [Wed, 29 Jul 2015 19:36:06 +0000 (12:36 -0700)]
Assign pseudo address for host-based RPA resolution matches

Bug: 21963935
Change-Id: Id72001ce17996ea04c3eba32cebcac4dbbe317bc

8 years agoPost-merged fix on "resolved conflicts for merge of f993a9c4 to mnc-dr-dev-plus-aosp"
Miao Chou [Wed, 29 Jul 2015 21:12:11 +0000 (14:12 -0700)]
Post-merged fix on "resolved conflicts for merge of f993a9c4 to mnc-dr-dev-plus-aosp"

Change-Id: Ia45ab5a0b5f4fac85db5a8c91980077b50b76513

8 years agoam 9a53a81b: am e1fe0e08: am b61d25c5: Fix memory leak in A2DP event handler
Andre Eisenbach [Wed, 29 Jul 2015 20:14:20 +0000 (20:14 +0000)]
am 9a53a81b: am e1fe0e08: am b61d25c5: Fix memory leak in A2DP event handler

* commit '9a53a81bf25aa7cbbce21581cc6c1d9dbe8a8f7c':
  Fix memory leak in A2DP event handler

8 years agoam e1fe0e08: am b61d25c5: Fix memory leak in A2DP event handler
Andre Eisenbach [Wed, 29 Jul 2015 19:48:17 +0000 (19:48 +0000)]
am e1fe0e08: am b61d25c5: Fix memory leak in A2DP event handler

* commit 'e1fe0e08d6385529b88192827ee4b9d76d462e94':
  Fix memory leak in A2DP event handler

8 years agoam b61d25c5: Fix memory leak in A2DP event handler
Andre Eisenbach [Wed, 29 Jul 2015 19:37:57 +0000 (19:37 +0000)]
am b61d25c5: Fix memory leak in A2DP event handler

* commit 'b61d25c52fcfa1853c7555acda61d848ef6be3e9':
  Fix memory leak in A2DP event handler

9 years agoFix memory leak in A2DP event handler
Andre Eisenbach [Wed, 29 Jul 2015 18:57:50 +0000 (11:57 -0700)]
Fix memory leak in A2DP event handler

btif_av_event_free_data() was not called in all states (idle state only)
leading to potential memory leaks.

Bug: 22822688
Change-Id: I40520c605c9a806e6cd5ee6e36c101d0aa8d4355

9 years agoam 7ffb0f1a: am dbb1ad17: am 82c8b927: Reset LE encryption key size at LE disconnecti...
Nitin Arora [Wed, 29 Jul 2015 10:46:50 +0000 (10:46 +0000)]
am 7ffb0f1a: am dbb1ad17: am 82c8b927: Reset LE encryption key size at LE disconnection only

* commit '7ffb0f1af6d0a26aec4c0b4b943131c093ca4107':
  Reset LE encryption key size at LE disconnection only

9 years agoam dbb1ad17: am 82c8b927: Reset LE encryption key size at LE disconnection only
Nitin Arora [Wed, 29 Jul 2015 10:06:19 +0000 (10:06 +0000)]
am dbb1ad17: am 82c8b927: Reset LE encryption key size at LE disconnection only

* commit 'dbb1ad17bae0fa3d0dc12795a73ea4a705e220ba':
  Reset LE encryption key size at LE disconnection only

9 years agoam 82c8b927: Reset LE encryption key size at LE disconnection only
Nitin Arora [Wed, 29 Jul 2015 08:15:32 +0000 (08:15 +0000)]
am 82c8b927: Reset LE encryption key size at LE disconnection only

* commit '82c8b9270ba962d5f271a833a3454baddbc063aa':
  Reset LE encryption key size at LE disconnection only

9 years agoam 909221f1: am c3f8ba8a: am dab356e3: Promote AVCTP version to 1.4
Anubhav Gupta [Wed, 29 Jul 2015 08:11:55 +0000 (08:11 +0000)]
am 909221f1: am c3f8ba8a: am dab356e3: Promote AVCTP version to 1.4

* commit '909221f185518946481ec841863448c89e1cfc1d':
  Promote AVCTP version to 1.4

9 years agoReset LE encryption key size at LE disconnection only
Nitin Arora [Thu, 2 Jul 2015 21:08:39 +0000 (14:08 -0700)]
Reset LE encryption key size at LE disconnection only

This change checks the transport type on receiving the disconnection
and resets the encryption key size only if the LE disconnection
has taken place.
This fixes the issue where read request to characteristics that
require encryption,  fails after cross key derivation due to
disconnection of BR/EDR transport.

Bug: 22515016
Change-Id: If6aad91a628eabbb5a4b7f5c22812fe94d4c5db2

9 years agoam c3f8ba8a: am dab356e3: Promote AVCTP version to 1.4
Anubhav Gupta [Wed, 29 Jul 2015 07:31:43 +0000 (07:31 +0000)]
am c3f8ba8a: am dab356e3: Promote AVCTP version to 1.4

* commit 'c3f8ba8a309a4b967e17c6398213e2b6aedbfc80':
  Promote AVCTP version to 1.4

9 years agoam dab356e3: Promote AVCTP version to 1.4
Anubhav Gupta [Wed, 29 Jul 2015 07:12:35 +0000 (07:12 +0000)]
am dab356e3: Promote AVCTP version to 1.4

* commit 'dab356e3b0573303840e63cbafb1065d57a11e2c':
  Promote AVCTP version to 1.4

9 years agoPromote AVCTP version to 1.4
Anubhav Gupta [Tue, 28 Jul 2015 06:32:57 +0000 (12:02 +0530)]
Promote AVCTP version to 1.4

Promoting AVCTP version to 1.4 from 1.2 as Bluedroid stack
already has got support for the same.
Below changes are incorporated as part of this:
 - AVCTP version in SDP entry is upgraded to 1.4 for both AVRCP
   Target and controller role.
 - Service class #1 is added in extra for AVRCP Controller SDP
   entry to be in sync with AVCTP version change.
 - Browsing support is not enabled as that needs corresponding
   profile level implementation, which is currently unavailable.

Change-Id: I72f7f67eb0a789fd321e9468f2a51bb5e9385a89

9 years agoresolved conflicts for merge of f993a9c4 to mnc-dr-dev-plus-aosp
Miao Chou [Wed, 29 Jul 2015 06:51:13 +0000 (23:51 -0700)]
resolved conflicts for merge of f993a9c4 to mnc-dr-dev-plus-aosp

Change-Id: I10f47626ef8dcba857a36c93b8b5b4071511fc7b

9 years agoam 1b3a3d82: Add GN files for vendor_libs
Arman Uguray [Wed, 29 Jul 2015 00:19:18 +0000 (00:19 +0000)]
am 1b3a3d82: Add GN files for vendor_libs

* commit '1b3a3d82840fd39e8b43e7cc761155dd1abeb417':
  Add GN files for vendor_libs

9 years agoMerge "build: Eliminate cutils/str_parms dependency from system/bt"
Miao-chen Chou [Tue, 28 Jul 2015 23:55:28 +0000 (23:55 +0000)]
Merge "build: Eliminate cutils/str_parms dependency from system/bt"

9 years agoAdd GN files for vendor_libs
Arman Uguray [Tue, 28 Jul 2015 01:32:05 +0000 (18:32 -0700)]
Add GN files for vendor_libs

Added BUILD.gn files for vendor_libs and vendor_libs/linux.

Bug: 21585592
Change-Id: I33f98421a94a4b4f530e48c94711775d776d02d7

9 years agobuild: Eliminate cutils/str_parms dependency from system/bt
Miao Chou [Wed, 8 Jul 2015 21:50:32 +0000 (14:50 -0700)]
build: Eliminate cutils/str_parms dependency from system/bt

Eliminate cutils/str_parmss dependency from system/bt by adding osi_str_parms:
 - Added hash_map_utils which implements partial functions of cutils/str_parms
   and uses osi/hash_map instead of cutils/hashmap.
 - Updated osi/Android.mk, osi/BUILD.gn and the includes in audio_a2dp to use
   osi_str_parms.
 - Added unittest for hash_map_utils.

Bug: 21957864
Change-Id: I8458d9e45df6cab2b71840d24d17b9d75de9842c

9 years agoam 09243e65: am 92339316: am 2ac9ae06: Fix a bug allocating buffers for fragmented...
Anubhav Gupta [Tue, 28 Jul 2015 19:19:22 +0000 (19:19 +0000)]
am 09243e65: am 92339316: am 2ac9ae06: Fix a bug allocating buffers for fragmented AVRC packets

* commit '09243e65a2d6f3150d23963cd2707e702fac7023':
  Fix a bug allocating buffers for fragmented AVRC packets

9 years agoam 92339316: am 2ac9ae06: Fix a bug allocating buffers for fragmented AVRC packets
Anubhav Gupta [Tue, 28 Jul 2015 18:31:38 +0000 (18:31 +0000)]
am 92339316: am 2ac9ae06: Fix a bug allocating buffers for fragmented AVRC packets

* commit '92339316ba8c56354f0b22aa966bfd60772caa23':
  Fix a bug allocating buffers for fragmented AVRC packets

9 years agoam 2ac9ae06: Fix a bug allocating buffers for fragmented AVRC packets
Anubhav Gupta [Tue, 28 Jul 2015 18:08:54 +0000 (18:08 +0000)]
am 2ac9ae06: Fix a bug allocating buffers for fragmented AVRC packets

* commit '2ac9ae06be5091f6f2eef0022a3810752f127d04':
  Fix a bug allocating buffers for fragmented AVRC packets

9 years agoFix a bug allocating buffers for fragmented AVRC packets
Anubhav Gupta [Fri, 24 Jul 2015 17:14:00 +0000 (10:14 -0700)]
Fix a bug allocating buffers for fragmented AVRC packets

Use the correct offset_len when allocating buffers for AVRC
packets that need to be fragmented.

Bug: 22156175

Change-Id: I7db12474c84edacb4f0739d50a43e8cebdcca676

9 years agoam f9fa3b1e: am aeef91cb: am 1500b8d9: Fix for uhid_event size check
Amirhossein Simjour [Tue, 28 Jul 2015 00:00:36 +0000 (00:00 +0000)]
am f9fa3b1e: am aeef91cb: am 1500b8d9: Fix for uhid_event size check

* commit 'f9fa3b1e28d3c0bc7a56a23f511bf70702bbdd13':
  Fix for uhid_event size check

9 years agoam aeef91cb: am 1500b8d9: Fix for uhid_event size check
Amirhossein Simjour [Mon, 27 Jul 2015 23:33:52 +0000 (23:33 +0000)]
am aeef91cb: am 1500b8d9: Fix for uhid_event size check

* commit 'aeef91cb76eaa66199c005e548be6787be762d00':
  Fix for uhid_event size check

9 years agoam 1500b8d9: Fix for uhid_event size check
Amirhossein Simjour [Mon, 27 Jul 2015 23:21:16 +0000 (23:21 +0000)]
am 1500b8d9: Fix for uhid_event size check

* commit '1500b8d9b301d8d68b2910692ec47d0e5b42c129':
  Fix for uhid_event size check

9 years agoFix for uhid_event size check
Amirhossein Simjour [Mon, 20 Jul 2015 18:29:19 +0000 (14:29 -0400)]
Fix for uhid_event size check

The uhid_event function used to expect that the return value of each
read function call to match with the size of the struct uhid_event.
Since the header file doesn't match the kernel driver, these two size
don't always match. The exact size check is replaced with expecting
the minimum required size.

Bug: 20108348
Change-Id: Ib61537092b109296f8290d802b68fc2efe78888c

9 years agoam fbbd2259: Only build bt_service_unittests for linux
Christopher Wiley [Mon, 27 Jul 2015 18:50:35 +0000 (18:50 +0000)]
am fbbd2259: Only build bt_service_unittests for linux

* commit 'fbbd225943c1e97074c61942d3fa29ae8c5fe202':
  Only build bt_service_unittests for linux

9 years agoam 7be593c0: am 62cfbb3a: am 760aa99b: Unpair HID device cleanup
Casper Bonde [Mon, 27 Jul 2015 18:42:45 +0000 (18:42 +0000)]
am 7be593c0: am 62cfbb3a: am 760aa99b: Unpair HID device cleanup

* commit '7be593c004e4b0360bcadaf866c4bd986aeda05a':
  Unpair HID device cleanup

9 years agoam dab35012: am 191e588b: am c6137426: Fix the logic for stopping the Power Managemen...
Pavlin Radoslavov [Mon, 27 Jul 2015 18:42:44 +0000 (18:42 +0000)]
am dab35012: am 191e588b: am c6137426: Fix the logic for stopping the Power Management timers.

* commit 'dab35012ae9303d11cc020f85bcf6b4f332c2b05':
  Fix the logic for stopping the Power Management timers.

9 years agoam 62cfbb3a: am 760aa99b: Unpair HID device cleanup
Casper Bonde [Mon, 27 Jul 2015 18:18:50 +0000 (18:18 +0000)]
am 62cfbb3a: am 760aa99b: Unpair HID device cleanup

* commit '62cfbb3a13ad30b4043583a6bff901fb4599b19a':
  Unpair HID device cleanup

9 years agoam 191e588b: am c6137426: Fix the logic for stopping the Power Management timers.
Pavlin Radoslavov [Mon, 27 Jul 2015 18:18:48 +0000 (18:18 +0000)]
am 191e588b: am c6137426: Fix the logic for stopping the Power Management timers.

* commit '191e588b5fcd026066049fdda65a4ae49c3d685c':
  Fix the logic for stopping the Power Management timers.

9 years agoam 760aa99b: Unpair HID device cleanup
Casper Bonde [Mon, 27 Jul 2015 18:05:45 +0000 (18:05 +0000)]
am 760aa99b: Unpair HID device cleanup

* commit '760aa99b0f1fb7830dd5ff23ec8f5c5630b15989':
  Unpair HID device cleanup

9 years agoam c6137426: Fix the logic for stopping the Power Management timers.
Pavlin Radoslavov [Mon, 27 Jul 2015 18:05:44 +0000 (18:05 +0000)]
am c6137426: Fix the logic for stopping the Power Management timers.

* commit 'c6137426081fc55d8c94cd0e6b55cd0d0a52f12d':
  Fix the logic for stopping the Power Management timers.

9 years agoUnpair HID device cleanup
Casper Bonde [Fri, 3 Oct 2014 08:01:36 +0000 (10:01 +0200)]
Unpair HID device cleanup

When unparing HID devices, the attr_mask was not cleared.
By not clearing this data, some HID device will never be able
to connect again. (E.g. the Apple Magic Mouse)

Bug: 15566403
Change-Id: Ic80909dcecdf48d967c1a936b31554653761fa42
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
9 years agoFix the logic for stopping the Power Management timers.
Pavlin Radoslavov [Sat, 25 Jul 2015 06:41:55 +0000 (23:41 -0700)]
Fix the logic for stopping the Power Management timers.

Previously, the logic for stopping the timers didn't take
into account whether each timer was already running.

Bug: 22666419
Change-Id: Ia99bf8be917e9ea69f478a954085336fc899040a

9 years agoOnly build bt_service_unittests for linux
Christopher Wiley [Mon, 27 Jul 2015 00:31:00 +0000 (17:31 -0700)]
Only build bt_service_unittests for linux

libchrome-host doesn't build on Mac, and while we get that sorted out,
let us not try and build this for Mac either.

Change-Id: I01d27391539d5c345d29a4ce949d0c3bcc931a7f

9 years agoam 081cba03: Add HCI user channel based bluedroid vendor adaptation
Samuel Ortiz [Sat, 25 Jul 2015 05:27:26 +0000 (05:27 +0000)]
am 081cba03: Add HCI user channel based bluedroid vendor adaptation

* commit '081cba0366ab5dfa11e68676ff5282a8e20e68f0':
  Add HCI user channel based bluedroid vendor adaptation

9 years agoAdd HCI user channel based bluedroid vendor adaptation
Samuel Ortiz [Fri, 24 Jul 2015 21:05:27 +0000 (14:05 -0700)]
Add HCI user channel based bluedroid vendor adaptation

This libbt vendor library creates and binds an HCI user channel
instead of talking to a serial port file descriptor. HCI frames
generated by the Android Bluetooth HAL are passed down as is to the
Linux kernel Bluetooth drivers through those sockets.
By pushing all the hardware dependencies down to the kernel, this
architecture supports all existing Linux Bluetooth drivers with
one single AOSP Bluetooth HAL implementation, Bluedroid.

Change-Id: I7197016b556e5d985843dd4f626db5d0f596f996

9 years agoam 065d0f70: service: Introduce a global Settings object
Arman Uguray [Fri, 24 Jul 2015 21:47:47 +0000 (21:47 +0000)]
am 065d0f70: service: Introduce a global Settings object

* commit '065d0f709343129f82ff3d072dcb36f612038598':
  service: Introduce a global Settings object

9 years agoservice: Introduce a global Settings object
Arman Uguray [Fri, 17 Jul 2015 01:12:13 +0000 (18:12 -0700)]
service: Introduce a global Settings object

Introduced a global Settings object that will store all runtime properties that
would be associated with a config file, Android system properties, etc. Added a
mechanism to parse command-line options which can be used to pass paths to
configuration files, file path for UNIX domain socket based IPC mechanism, and
any other property that is dynamic in nature. This will help us remove hardcoded
paths, strings, and other such values in the future.

Bug: 22532366
Change-Id: I8e790363ed31d44369f7991a8ea7132d1cace70b

9 years agoam f2d6434a: gn-build: Add bluetooth-service target
Arman Uguray [Fri, 24 Jul 2015 21:10:56 +0000 (21:10 +0000)]
am f2d6434a: gn-build: Add bluetooth-service target

* commit 'f2d6434a6b7ad98e20c7a601d2a0950237514837':
  gn-build: Add bluetooth-service target

9 years agoam e03aaf82: am fd726554: am 196413f5: Fix TX queue overflow detection
Andre Eisenbach [Fri, 24 Jul 2015 20:23:41 +0000 (20:23 +0000)]
am e03aaf82: am fd726554: am 196413f5: Fix TX queue overflow detection

* commit 'e03aaf82bde453aece78d3979eb9075ea04a6766':
  Fix TX queue overflow detection

9 years agoam fd726554: am 196413f5: Fix TX queue overflow detection
Andre Eisenbach [Fri, 24 Jul 2015 19:54:23 +0000 (19:54 +0000)]
am fd726554: am 196413f5: Fix TX queue overflow detection

* commit 'fd726554d65013f6e68daf263630018de9ca15ed':
  Fix TX queue overflow detection

9 years agoam 196413f5: Fix TX queue overflow detection
Andre Eisenbach [Fri, 24 Jul 2015 19:37:52 +0000 (19:37 +0000)]
am 196413f5: Fix TX queue overflow detection

* commit '196413f5ca088ef97866092f02bb7571d2a44390':
  Fix TX queue overflow detection

9 years agoFix TX queue overflow detection
Andre Eisenbach [Wed, 22 Jul 2015 20:47:28 +0000 (13:47 -0700)]
Fix TX queue overflow detection

- Prevent possible endless loop if |nb_frame| is too high
- Remove off-by-one calculation before sending frames
- Remove log spam and add better debug info

Bug: 22658329
Change-Id: I374ee980aec48763beb49b4f6f8b076124cadf40

9 years agoam 945ba110: am 09d39288: am 1076b7b0: Customize Bluetooth sniff interval
Pavlin Radoslavov [Fri, 24 Jul 2015 04:08:38 +0000 (04:08 +0000)]
am 945ba110: am 09d39288: am 1076b7b0: Customize Bluetooth sniff interval

* commit '945ba1102613768b04b1878a6924e5e7ee4ea05d':
  Customize Bluetooth sniff interval

9 years agoam 09d39288: am 1076b7b0: Customize Bluetooth sniff interval
Pavlin Radoslavov [Fri, 24 Jul 2015 03:09:28 +0000 (03:09 +0000)]
am 09d39288: am 1076b7b0: Customize Bluetooth sniff interval

* commit '09d3928877e746c0e9dd3b8fe294a55432ec8d46':
  Customize Bluetooth sniff interval

9 years agoam 79835b49: am 4e291106: am 197ee685: Fix a crash for a race condition during Blueto...
Pavlin Radoslavov [Thu, 23 Jul 2015 21:50:51 +0000 (21:50 +0000)]
am 79835b49: am 4e291106: am 197ee685: Fix a crash for a race condition during Bluetooth shutdown

* commit '79835b4968d94f0be015b97bac4178b407da275d':
  Fix a crash for a race condition during Bluetooth shutdown

9 years agoam e61ad8de: am 8cc6e42e: am ac72840a: Update device type correctly in the NVRAM...
Nitin Arora [Thu, 23 Jul 2015 21:50:50 +0000 (21:50 +0000)]
am e61ad8de: am 8cc6e42e: am ac72840a: Update device type correctly in the NVRAM at inquiry result

* commit 'e61ad8de11ed410c58a0d8f8456e56c81d64b111':
  Update device type correctly in the NVRAM at inquiry result

9 years agoam 4e291106: am 197ee685: Fix a crash for a race condition during Bluetooth shutdown
Pavlin Radoslavov [Thu, 23 Jul 2015 19:22:18 +0000 (19:22 +0000)]
am 4e291106: am 197ee685: Fix a crash for a race condition during Bluetooth shutdown

* commit '4e29110681953c45bbf43799d38b69cd5b447806':
  Fix a crash for a race condition during Bluetooth shutdown

9 years agoam 8cc6e42e: am ac72840a: Update device type correctly in the NVRAM at inquiry result
Nitin Arora [Thu, 23 Jul 2015 19:22:17 +0000 (19:22 +0000)]
am 8cc6e42e: am ac72840a: Update device type correctly in the NVRAM at inquiry result

* commit '8cc6e42efaac326520e8f9e28bd9e4e5e113fa6d':
  Update device type correctly in the NVRAM at inquiry result

9 years agoam 1076b7b0: Customize Bluetooth sniff interval
Pavlin Radoslavov [Thu, 23 Jul 2015 19:21:32 +0000 (19:21 +0000)]
am 1076b7b0: Customize Bluetooth sniff interval

* commit '1076b7b0a642d0f5c5948819bcd07e4bc0fb2738':
  Customize Bluetooth sniff interval

9 years agoCustomize Bluetooth sniff interval
Pavlin Radoslavov [Thu, 23 Jul 2015 05:49:26 +0000 (22:49 -0700)]
Customize Bluetooth sniff interval

Fix an earlier commit that prevents from customizing some of
the Bluetooth sniff parameters - those cannot be overwritten
anymore in the bdroid_buildcfg.h file.

Also, fixed the indexing in tables bta_dm_pm_cfg[]
and bta_dm_pm_spec[]

Bug: 22676670
Change-Id: I3a7074b9a9c91d312dc5d4314b7c304baf4ae20d

9 years agogn-build: Add bluetooth-service target
Arman Uguray [Wed, 8 Jul 2015 22:47:39 +0000 (15:47 -0700)]
gn-build: Add bluetooth-service target

This patch makes the Bluetooth system service (service/) buildable using GN:

1. Added new BUILD.gn file for service/
2. Added conditional compilation for global config paths, with TODOs for
generalizing them later.
3. Added a shim for loading the Bluetooth library that calls hw_get_module on
Android and explicitly calls dlopen on OS_GENERIC.
4. Fixed compile warnings and errors.
5. Did some minor clean up in gatt_server.cpp for better readability.

Bug: 22124644
Change-Id: I3226537a3a5211a6762651a35707638df29956b0

9 years agoam 197ee685: Fix a crash for a race condition during Bluetooth shutdown
Pavlin Radoslavov [Wed, 22 Jul 2015 20:24:37 +0000 (20:24 +0000)]
am 197ee685: Fix a crash for a race condition during Bluetooth shutdown

* commit '197ee6856b43d8eea137a7f37798ee2a012ce518':
  Fix a crash for a race condition during Bluetooth shutdown