OSDN Git Service
Andre Eisenbach [Mon, 19 Oct 2015 20:28:23 +0000 (20:28 +0000)]
am
12abc3cb: am
3f236aa1: am
410970f2: Ensure thread priority is raised for media task / UIPC
* commit '
12abc3cbe61c3b4bb03b7319056abccf56d71565':
Ensure thread priority is raised for media task / UIPC
Andre Eisenbach [Mon, 19 Oct 2015 20:28:22 +0000 (20:28 +0000)]
am
4f1f20f4: am
1535b55c: am
8c24123f: Change UHID socket to be non-blocking
* commit '
4f1f20f46825f365671afe52f39f741b05747860':
Change UHID socket to be non-blocking
Nitin Shivpure [Mon, 19 Oct 2015 20:28:22 +0000 (20:28 +0000)]
am
662545ac: am
2ae635f4: am
7f2eed69: Check BR device count before initiating role switch
* commit '
662545ac2c86efc0d3504de47bc51b09ee648cd7':
Check BR device count before initiating role switch
Pavlin Radoslavov [Mon, 19 Oct 2015 20:09:47 +0000 (13:09 -0700)]
resolved conflicts for
a7a277cf to master
Change-Id: I63d0a0742a5476f5b951f10956b726810882565c
Sharvil Nanavati [Mon, 19 Oct 2015 19:55:07 +0000 (19:55 +0000)]
am
3880a381: am
16c682a7: am
de86bfa2: Add libpower as a dependency to all device targets that include libosi.
* commit '
3880a3812bdc148018f5adfaf41720e6d322e0d1':
Add libpower as a dependency to all device targets that include libosi.
tturney [Mon, 19 Oct 2015 19:55:07 +0000 (19:55 +0000)]
am
152dda92: am
e1beca8b: am
20a1555a: Allow BT inquiry while discovery is in progress.
* commit '
152dda920ceaff4a7331ae3decd1e97920b43da2':
Allow BT inquiry while discovery is in progress.
Pavlin Radoslavov [Mon, 19 Oct 2015 19:55:06 +0000 (19:55 +0000)]
am
800f0bd2: am
78f84da0: am
7b4fdb40: Eliminate recursive calling when handling GATT related errors
* commit '
800f0bd29515504b773b776c277ce74dd68aabc3':
Eliminate recursive calling when handling GATT related errors
wang ping [Mon, 19 Oct 2015 19:55:05 +0000 (19:55 +0000)]
am
76d13f8d: am
de5a6f38: am
aafe557b: Fix issue where bluesleep idle timer is not started
* commit '
76d13f8d8c9233e96b965724993704773e65f823':
Fix issue where bluesleep idle timer is not started
tturney [Mon, 19 Oct 2015 19:55:05 +0000 (19:55 +0000)]
am
cb7e8f9b: am
4d99e011: am
530f7727: Fix btwrite timer timeout for Angler (2/2)
* commit '
cb7e8f9bbe62f11088f9e5b90b1b470fa3ca52b8':
Fix btwrite timer timeout for Angler (2/2)
Joshua Schwarz [Mon, 19 Oct 2015 19:55:04 +0000 (19:55 +0000)]
am
e9ab8a36: am
8bad5d06: am
9d0965c9: Implementation of net_test_bluedroid as a GTest.
* commit '
e9ab8a36d222b135bb51cd8a49c3a6b71269b106':
Implementation of net_test_bluedroid as a GTest.
Jacob Lee [Mon, 19 Oct 2015 19:55:03 +0000 (19:55 +0000)]
am
9b8f7c62: am
cc504635: am
fda32d91: LE Multi-Advertising State Change Sub-event Wrong Variable Type
* commit '
9b8f7c62c428bb60fce38c6ec3177923a2fa1a13':
LE Multi-Advertising State Change Sub-event Wrong Variable Type
Sunny Kapdi [Mon, 19 Oct 2015 19:55:02 +0000 (19:55 +0000)]
am
1d5fe5c4: am
958f09b6: am
4602429d: Fix incorrect SetConnScanParam function mapping
* commit '
1d5fe5c41e57f70727735f0e94dfd17d780c6bb4':
Fix incorrect SetConnScanParam function mapping
Chih-Hung Hsieh [Mon, 19 Oct 2015 19:55:01 +0000 (19:55 +0000)]
am
1948336c: am
a887e765: am
11026214: Enable clang compilation.
* commit '
1948336c4025489b61f725f0357ab71a79a22da7':
Enable clang compilation.
Sharvil Nanavati [Mon, 19 Oct 2015 19:55:00 +0000 (19:55 +0000)]
am
c8eb3f77: am
7deacad6: am
3858011b: Send current RPA instead of pseudo-address on connect.
* commit '
c8eb3f77e15017187685180cdbca51697b1da54f':
Send current RPA instead of pseudo-address on connect.
Eric Laurent [Mon, 19 Oct 2015 19:54:59 +0000 (19:54 +0000)]
am
a4d32b59: am
6106a1b3: am
f34d336a: (-s ours) A2DP audio HAL: implement out_get_presentation_position()
* commit '
a4d32b59192b985a13a2f3fada0cf79a2b1ba1d1':
A2DP audio HAL: implement out_get_presentation_position()
Ajay Panicker [Mon, 19 Oct 2015 19:54:58 +0000 (19:54 +0000)]
am
5e20685e: am
22c1d4fe: am
28f294b9: Load factory Bluetooth address from system property
* commit '
5e20685e4dae1cefa0a6ad05be9f3c0e0e41f192':
Load factory Bluetooth address from system property
Sharvil Nanavati [Mon, 19 Oct 2015 19:54:57 +0000 (19:54 +0000)]
am
97018a4c: am
09e9dec4: am
6a42cbdb: Add a SCO routing command to net_hci.
* commit '
97018a4ccd797c8ada1ebc8cdf85cc4da0d634ca':
Add a SCO routing command to net_hci.
Andre Eisenbach [Mon, 19 Oct 2015 19:54:56 +0000 (19:54 +0000)]
am
e37a7807: am
7fbf06c2: am
2af0bb6e: Fix merge discrepencies and resulting compile errors
* commit '
e37a780798cf0179f10b7baec1f48114944b7749':
Fix merge discrepencies and resulting compile errors
Andre Eisenbach [Mon, 19 Oct 2015 19:14:11 +0000 (19:14 +0000)]
am
3f236aa1: am
410970f2: Ensure thread priority is raised for media task / UIPC
* commit '
3f236aa1a63a63f47ea0fcead037292ab59116bb':
Ensure thread priority is raised for media task / UIPC
Andre Eisenbach [Mon, 19 Oct 2015 19:14:10 +0000 (19:14 +0000)]
am
1535b55c: am
8c24123f: Change UHID socket to be non-blocking
* commit '
1535b55c2f9691c0fda6e22de9367145b99bc03f':
Change UHID socket to be non-blocking
Nitin Shivpure [Mon, 19 Oct 2015 19:14:10 +0000 (19:14 +0000)]
am
2ae635f4: am
7f2eed69: Check BR device count before initiating role switch
* commit '
2ae635f40a0f942b0b876176dd5d83ea35070338':
Check BR device count before initiating role switch
Pavlin Radoslavov [Mon, 19 Oct 2015 19:14:09 +0000 (19:14 +0000)]
am
4eaa995e: am
642f2330: GKI cleanup - Eliminated function GKI_delay
* commit '
4eaa995e5a596c862c46e41c07e5203b3dbd6f8c':
GKI cleanup - Eliminated function GKI_delay
Sharvil Nanavati [Mon, 19 Oct 2015 19:14:08 +0000 (19:14 +0000)]
am
16c682a7: am
de86bfa2: Add libpower as a dependency to all device targets that include libosi.
* commit '
16c682a7e8295843d2c905a4aea1096bdca522f8':
Add libpower as a dependency to all device targets that include libosi.
tturney [Mon, 19 Oct 2015 19:14:08 +0000 (19:14 +0000)]
am
e1beca8b: am
20a1555a: Allow BT inquiry while discovery is in progress.
* commit '
e1beca8bbcfcfba2bf6ab46627a439ff95cdb0fa':
Allow BT inquiry while discovery is in progress.
Pavlin Radoslavov [Mon, 19 Oct 2015 19:14:07 +0000 (19:14 +0000)]
am
78f84da0: am
7b4fdb40: Eliminate recursive calling when handling GATT related errors
* commit '
78f84da065c336941a80895756614ff87d3b481f':
Eliminate recursive calling when handling GATT related errors
wang ping [Mon, 19 Oct 2015 19:14:06 +0000 (19:14 +0000)]
am
de5a6f38: am
aafe557b: Fix issue where bluesleep idle timer is not started
* commit '
de5a6f387eb366f605e9d759148f40862c9bca1a':
Fix issue where bluesleep idle timer is not started
tturney [Mon, 19 Oct 2015 19:14:06 +0000 (19:14 +0000)]
am
4d99e011: am
530f7727: Fix btwrite timer timeout for Angler (2/2)
* commit '
4d99e011dcc7b0bef88bb24d7d7b5e51897bfaa5':
Fix btwrite timer timeout for Angler (2/2)
Joshua Schwarz [Mon, 19 Oct 2015 19:14:05 +0000 (19:14 +0000)]
am
8bad5d06: am
9d0965c9: Implementation of net_test_bluedroid as a GTest.
* commit '
8bad5d06de9792e19bb698c049c7bfa347520cba':
Implementation of net_test_bluedroid as a GTest.
Jacob Lee [Mon, 19 Oct 2015 19:14:05 +0000 (19:14 +0000)]
am
cc504635: am
fda32d91: LE Multi-Advertising State Change Sub-event Wrong Variable Type
* commit '
cc5046351361c5684f97cbb1032f5d514581592e':
LE Multi-Advertising State Change Sub-event Wrong Variable Type
Sunny Kapdi [Mon, 19 Oct 2015 19:14:04 +0000 (19:14 +0000)]
am
958f09b6: am
4602429d: Fix incorrect SetConnScanParam function mapping
* commit '
958f09b6a0e8af5ef9e26f3cb6eec5117f5e8b4d':
Fix incorrect SetConnScanParam function mapping
Chih-Hung Hsieh [Mon, 19 Oct 2015 19:14:03 +0000 (19:14 +0000)]
am
a887e765: am
11026214: Enable clang compilation.
* commit '
a887e765da53bb49b7cb834e930cd793732dbcc9':
Enable clang compilation.
Sharvil Nanavati [Mon, 19 Oct 2015 19:14:03 +0000 (19:14 +0000)]
am
7deacad6: am
3858011b: Send current RPA instead of pseudo-address on connect.
* commit '
7deacad6f54e08296527769b514183532d6fda29':
Send current RPA instead of pseudo-address on connect.
Eric Laurent [Mon, 19 Oct 2015 19:14:02 +0000 (19:14 +0000)]
am
6106a1b3: am
f34d336a: (-s ours) A2DP audio HAL: implement out_get_presentation_position()
* commit '
6106a1b3217ff15a62498e706812a0a548a72261':
A2DP audio HAL: implement out_get_presentation_position()
Andre Eisenbach [Mon, 19 Oct 2015 19:10:37 +0000 (12:10 -0700)]
am
410970f2: Ensure thread priority is raised for media task / UIPC
* commit '
410970f285ff34e6f1952dec2202825d890c3a0d':
Ensure thread priority is raised for media task / UIPC
Andre Eisenbach [Mon, 19 Oct 2015 19:10:36 +0000 (12:10 -0700)]
am
8c24123f: Change UHID socket to be non-blocking
* commit '
8c24123f9897991d228865c7eec35e33569e46bb':
Change UHID socket to be non-blocking
Nitin Shivpure [Mon, 19 Oct 2015 19:10:36 +0000 (12:10 -0700)]
am
7f2eed69: Check BR device count before initiating role switch
* commit '
7f2eed693f328843ed912144ed6ffcab0f2e3e75':
Check BR device count before initiating role switch
Pavlin Radoslavov [Mon, 19 Oct 2015 19:10:35 +0000 (12:10 -0700)]
am
642f2330: GKI cleanup - Eliminated function GKI_delay
* commit '
642f233005cdcbbbcb92b77d6297fc080b7f072e':
GKI cleanup - Eliminated function GKI_delay
Sharvil Nanavati [Mon, 19 Oct 2015 19:10:35 +0000 (12:10 -0700)]
am
de86bfa2: Add libpower as a dependency to all device targets that include libosi.
* commit '
de86bfa27b3ae6a9812788efe2b76fa3e7931d56':
Add libpower as a dependency to all device targets that include libosi.
tturney [Mon, 19 Oct 2015 19:10:34 +0000 (12:10 -0700)]
am
20a1555a: Allow BT inquiry while discovery is in progress.
* commit '
20a1555a0665efaab69ff25b3e7842d5f6c110c8':
Allow BT inquiry while discovery is in progress.
Pavlin Radoslavov [Mon, 19 Oct 2015 19:10:34 +0000 (12:10 -0700)]
am
7b4fdb40: Eliminate recursive calling when handling GATT related errors
* commit '
7b4fdb40e81a68d254f6bf7cefbc385d978fb9d0':
Eliminate recursive calling when handling GATT related errors
wang ping [Mon, 19 Oct 2015 19:10:33 +0000 (12:10 -0700)]
am
aafe557b: Fix issue where bluesleep idle timer is not started
* commit '
aafe557b56f2fb97a9d96a86bef8b4d6886cc6b3':
Fix issue where bluesleep idle timer is not started
tturney [Mon, 19 Oct 2015 19:10:33 +0000 (12:10 -0700)]
am
530f7727: Fix btwrite timer timeout for Angler (2/2)
* commit '
530f7727badf163705eb9638533f5af5d89fcacf':
Fix btwrite timer timeout for Angler (2/2)
Joshua Schwarz [Mon, 19 Oct 2015 19:10:32 +0000 (12:10 -0700)]
am
9d0965c9: Implementation of net_test_bluedroid as a GTest.
* commit '
9d0965c9c9aaeac3dbb3b1ba5f76b3d9010f3eaa':
Implementation of net_test_bluedroid as a GTest.
Jacob Lee [Mon, 19 Oct 2015 19:10:32 +0000 (12:10 -0700)]
am
fda32d91: LE Multi-Advertising State Change Sub-event Wrong Variable Type
* commit '
fda32d91ec7f5a2e04464d19a6e57cddbe81c2e7':
LE Multi-Advertising State Change Sub-event Wrong Variable Type
Sunny Kapdi [Mon, 19 Oct 2015 19:10:31 +0000 (12:10 -0700)]
am
4602429d: Fix incorrect SetConnScanParam function mapping
* commit '
4602429dbcf5a5d6076f65450354be4db9f0f114':
Fix incorrect SetConnScanParam function mapping
Chih-Hung Hsieh [Mon, 19 Oct 2015 19:10:31 +0000 (12:10 -0700)]
am
11026214: Enable clang compilation.
* commit '
110262140c4ab383a27d19c08e33f5937bd09c11':
Enable clang compilation.
Sharvil Nanavati [Mon, 19 Oct 2015 19:10:31 +0000 (12:10 -0700)]
am
3858011b: Send current RPA instead of pseudo-address on connect.
* commit '
3858011befbf62ac8c38af1493d9c61d43f999da':
Send current RPA instead of pseudo-address on connect.
Eric Laurent [Mon, 19 Oct 2015 19:10:30 +0000 (12:10 -0700)]
am
f34d336a: (-s ours) A2DP audio HAL: implement out_get_presentation_position()
* commit '
f34d336a16a6788f667355b70a4d53b1325a25ed':
A2DP audio HAL: implement out_get_presentation_position()
Ajay Panicker [Mon, 19 Oct 2015 19:09:47 +0000 (19:09 +0000)]
am
22c1d4fe: am
28f294b9: Load factory Bluetooth address from system property
* commit '
22c1d4fe04bea076b793d370cd8fe9ab00660eb5':
Load factory Bluetooth address from system property
Sharvil Nanavati [Mon, 19 Oct 2015 19:09:46 +0000 (19:09 +0000)]
am
09e9dec4: am
6a42cbdb: Add a SCO routing command to net_hci.
* commit '
09e9dec4a8011803ba3343ad0eeb347583b41c11':
Add a SCO routing command to net_hci.
Andre Eisenbach [Mon, 19 Oct 2015 19:09:45 +0000 (19:09 +0000)]
am
7fbf06c2: am
2af0bb6e: Fix merge discrepencies and resulting compile errors
* commit '
7fbf06c2ba7a57d38e567c36941d5aca8c906b71':
Fix merge discrepencies and resulting compile errors
Ajay Panicker [Mon, 19 Oct 2015 19:03:02 +0000 (12:03 -0700)]
am
28f294b9: Load factory Bluetooth address from system property
* commit '
28f294b94f6e05f4572672671535f66bb60f0c0a':
Load factory Bluetooth address from system property
Sharvil Nanavati [Mon, 19 Oct 2015 19:03:02 +0000 (12:03 -0700)]
am
6a42cbdb: Add a SCO routing command to net_hci.
* commit '
6a42cbdb53d856a364a0c0fac28a732b55bc1cd9':
Add a SCO routing command to net_hci.
Andre Eisenbach [Mon, 19 Oct 2015 19:03:01 +0000 (12:03 -0700)]
am
2af0bb6e: Fix merge discrepencies and resulting compile errors
* commit '
2af0bb6e5f6b380f374d510c54eabdf74c32bdf2':
Fix merge discrepencies and resulting compile errors
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.
Andre Eisenbach [Sat, 19 Sep 2015 03:13:53 +0000 (20:13 -0700)]
Ensure thread priority is raised for media task / UIPC
Bug:
23978964
Change-Id: I36b6d05bb82eb0283eed3b465038d65890c4c245
Andre Eisenbach [Thu, 17 Sep 2015 22:16:20 +0000 (15:16 -0700)]
Change UHID socket to be non-blocking
On some platforms, the logs indicate that the BTU task is stalled by
UHID driver when writing the HID descriptor to the kernel. This patch
converts the UHID socket to non-blocking to avoid stalling the main
BTU task.
Bug:
23978964
Change-Id: I5a7a3e106fb2c967d68f077faedcd4fe62bbd912
Nitin Shivpure [Wed, 12 Aug 2015 12:45:11 +0000 (18:15 +0530)]
Check BR device count before initiating role switch
A case where DUT is acting as PANU device on BR/EDR link & also
acting as central on LE link. As LE link & PANU link need not to
be master & it's not a scatter-net scenario, because there is only
a BR link. So checking for BR device count before initiating role
switch to avoid continuous loop of role switches.
Cherry-picked from: https://partner-android-review.googlesource.com/#/c/376058/
Change-Id: I70e4041a71ba965f1f9e25729c3cfd20ae03d6b4
Bug:
23290136
Pavlin Radoslavov [Wed, 16 Sep 2015 20:30:26 +0000 (13:30 -0700)]
GKI cleanup - Eliminated function GKI_delay
Removed function GKI_delay from the GKI module, and replaced
it with a local static function inside file btif/src/btif_rc.c - the
only place it is (still) used.
Change-Id: Id8f3f700efd22d6e31c70aa8b1724ffa9afbc631
Sharvil Nanavati [Wed, 9 Sep 2015 22:56:17 +0000 (15:56 -0700)]
Add libpower as a dependency to all device targets that include libosi.
Bug:
23902077
Change-Id: Icc7119a2b3199310e2210d46f599da00261fdff6
tturney [Tue, 8 Sep 2015 21:42:09 +0000 (14:42 -0700)]
Allow BT inquiry while discovery is in progress.
BT Inquiry is disallowed when service discovery
is in progress. Innitially when GATT discovery
is in progress (crosskey pairing), it resulted
in inquiry requests being rejected. During an
insecure connection like OPP, bonding link key
is not stored. In an earlier patch (
b820aec7),
BR/EDR discovery was bypassed if the bonding was
temporary. However, this was not done for LE.
Applying the same logic to LE, resolved the
inquiry issue reported in this bug.
Bug:
23468169
Change-Id: I6111c80a420aeb0bc36a0393eb215c112512d251
Pavlin Radoslavov [Sat, 5 Sep 2015 00:55:09 +0000 (17:55 -0700)]
Eliminate recursive calling when handling GATT related errors
If there are errors when processing GATT related events (e.g.,
configuring the MTU), don't use recursive calls into
bta_gattc_sm_execute(), because it breaks the free-ing of some
of the memory.
Bug:
23756301
Change-Id: I3c685170e868ffbf4e488d2bb5a31904e3f7b39d
wang ping [Sat, 5 Sep 2015 17:48:09 +0000 (10:48 -0700)]
Fix issue where bluesleep idle timer is not started
Sometimes allow_device_sleep() is called before wake_assert, this result in transmit_done
does not start idle timer. This is because the "wake_state" does not match while
allow_device_sleep() is called before wake_assert() is called. So start idle timer
anyway when transmit_done is called.
Bug:
23754156
Change-Id: I5437aea0abc4b7f5cf847701e2d0a889c6823fcb
tturney [Mon, 31 Aug 2015 22:16:59 +0000 (15:16 -0700)]
Fix btwrite timer timeout for Angler (2/2)
When calculating the appropriate LPM's idle timeout,
the local chip name was NULL. This is fixed by calculating
LMP's idle timeout when the chip is enabling.
Bug:
23248798
Change-Id: I8ee2b28fb4363359e035e242fdcff8a736ee448c
Joshua Schwarz [Thu, 27 Aug 2015 21:15:26 +0000 (14:15 -0700)]
Implementation of net_test_bluedroid as a GTest.
Change-Id: If9fc9a26fe58858a107b8ad6ac9f1e757ba07f90
Jacob Lee [Wed, 26 Aug 2015 06:43:59 +0000 (14:43 +0800)]
LE Multi-Advertising State Change Sub-event Wrong Variable Type
Wrong connection handle type in multi-adv event parsing,
causing random address (confirm value) mismatch and pairing failure.
Bug id:
23201007
Change-Id: I13ce231360937e711f61eb0777805b07bcde7074
Sunny Kapdi [Thu, 27 Aug 2015 07:37:31 +0000 (00:37 -0700)]
Fix incorrect SetConnScanParam function mapping
BTA_DM_API_BLE_CONN_SCAN_PARAM_EVT is defined before
BTA_DM_API_BLE_SCAN_PARAM_EVT in the enum but the corresponding
entries in bta_dm_action were inverted. This resulted in incorrect
invocation of set_conn_scan_params while trying to set parameters
for scanning. The call was hence failing here and was not
resulting in setting of the new scan parameters in the Controller
irrespective of the scan mode selected from the App. This would
essentially result in the breakage of ScanSettings.SCAN_MODE_<xx>
Android SDK APIs.
Bug:
23602042
Change-Id: I17e1b14a32250e3ccb7631a67690ec2e0a6bc321
Chih-Hung Hsieh [Thu, 27 Aug 2015 19:07:17 +0000 (12:07 -0700)]
Enable clang compilation.
Files under system/bt/device do not use atomic operation.
Old setting of LOCAL_CLANG is unnecessary.
Other atomic operations in system/bt/bt/core were changed
and osi/include/atomic.h was removed, in
https://android-review.googlesource.com/#/c/166762
Change-Id: I807e1fd1792e801392f40ab92a8990c826a5785a
Sharvil Nanavati [Mon, 10 Aug 2015 20:00:06 +0000 (13:00 -0700)]
Send current RPA instead of pseudo-address on connect.
Bug:
23079777
Change-Id: If6da80392748cdaad2a4833dd31fe299b62c28e3
Eric Laurent [Tue, 26 May 2015 22:50:29 +0000 (15:50 -0700)]
A2DP audio HAL: implement out_get_presentation_position()
And complete implementation of out_get_render_position()
Bug:
21199150
Change-Id: I95038ad68433e401b096a0159282a2ae372570e1
Ajay Panicker [Mon, 3 Aug 2015 23:29:31 +0000 (16:29 -0700)]
Load factory Bluetooth address from system property
Implemented a check to grab the ro.boot.btmacaddr property in case the
device fails to receive an address beforehand.
Bug:
22618015
Change-Id: Ie322888e114a732f8e85c81793e3e5e5eacffc7a
Sharvil Nanavati [Thu, 16 Jul 2015 09:55:27 +0000 (02:55 -0700)]
Add a SCO routing command to net_hci.
This allows us to change the SCO routing parameters at runtime while
debugging / doing device bringup.
Change-Id: I8bafb7c7fb7ad7470d378cd14a7ee4aad63f3b9b
Andre Eisenbach [Fri, 22 May 2015 00:07:21 +0000 (17:07 -0700)]
Fix merge discrepencies and resulting compile errors
Change-Id: I29fbec9f668ee9218b90a222801c9ddcb9352017
Arman Uguray [Wed, 14 Oct 2015 21:01:56 +0000 (21:01 +0000)]
am
629f9555: am
d3bfaecc: am
ff1469f0: service/doc: Fixed some post-review comments
* commit '
629f9555ee20a310b62bcc13427aec1fc2a0efcf':
service/doc: Fixed some post-review comments
Arman Uguray [Wed, 14 Oct 2015 20:30:32 +0000 (20:30 +0000)]
am
8ca512c3: am
3f6cfff7: am
9fc7d81c: service: Fix broken UUID advertising
* commit '
8ca512c35d72edb44b049cca700735eeac211410':
service: Fix broken UUID advertising
Arman Uguray [Wed, 14 Oct 2015 20:30:29 +0000 (20:30 +0000)]
am
d3bfaecc: am
ff1469f0: service/doc: Fixed some post-review comments
* commit '
d3bfaecca37776ba15ac3b2acdc6fea9524172b4':
service/doc: Fixed some post-review comments
Arman Uguray [Wed, 14 Oct 2015 20:26:54 +0000 (20:26 +0000)]
am
614ee0e7: am
1e18ddc4: am
87222e0e: service/client: Add start-adv -u flag
* commit '
614ee0e7c9c1c2915ab66d28d18ea3db8ce1f296':
service/client: Add start-adv -u flag
Arman Uguray [Wed, 14 Oct 2015 20:26:53 +0000 (20:26 +0000)]
am
a7d32ade: am
de312356: am
de5cc703: service: Improve creating UUIDs from string
* commit '
a7d32ade6cf04a32c23bf97d6c1380be260e0a1b':
service: Improve creating UUIDs from string
Arman Uguray [Wed, 14 Oct 2015 20:26:44 +0000 (20:26 +0000)]
am
3f6cfff7: am
9fc7d81c: service: Fix broken UUID advertising
* commit '
3f6cfff74c5b9cbcbf2edd1fbbaa13cf66f3b965':
service: Fix broken UUID advertising
Arman Uguray [Wed, 14 Oct 2015 20:23:59 +0000 (20:23 +0000)]
am
ff1469f0: service/doc: Fixed some post-review comments
* commit '
ff1469f0e762840c0c745e7306b1edd96167a4c6':
service/doc: Fixed some post-review comments
Arman Uguray [Wed, 14 Oct 2015 20:20:55 +0000 (20:20 +0000)]
am
1e18ddc4: am
87222e0e: service/client: Add start-adv -u flag
* commit '
1e18ddc491ef945b278df497b2d8372da0fb3275':
service/client: Add start-adv -u flag
Arman Uguray [Wed, 14 Oct 2015 20:20:54 +0000 (20:20 +0000)]
am
de312356: am
de5cc703: service: Improve creating UUIDs from string
* commit '
de3123563665c352a50ffb1b4e0e16da5c082887':
service: Improve creating UUIDs from string
Arman Uguray [Wed, 14 Oct 2015 20:19:58 +0000 (20:19 +0000)]
am
9fc7d81c: service: Fix broken UUID advertising
* commit '
9fc7d81c2dfa3f9b7c4381cd83e5e8f788e235f3':
service: Fix broken UUID advertising
Arman Uguray [Tue, 13 Oct 2015 16:04:44 +0000 (09:04 -0700)]
service/doc: Fixed some post-review comments
Change-Id: I62e4f26cc55763f5880922bd06373db47329def9
Arman Uguray [Wed, 14 Oct 2015 20:14:55 +0000 (20:14 +0000)]
am
87222e0e: service/client: Add start-adv -u flag
* commit '
87222e0e826216c69f6a9a5bfe77689561067474':
service/client: Add start-adv -u flag
Arman Uguray [Wed, 14 Oct 2015 20:14:53 +0000 (20:14 +0000)]
am
de5cc703: service: Improve creating UUIDs from string
* commit '
de5cc7034275bf0dfc0124d07b28c70ec634aed7':
service: Improve creating UUIDs from string
Arman Uguray [Wed, 14 Oct 2015 19:22:27 +0000 (12:22 -0700)]
service: Fix broken UUID advertising
The BTIF API expects a single 128-bit UUID in little-endian form to be
passed for its multi-adv service UUID field. The system service never
did this conversion so UUIDs were never properly advertised. This CL
fixes this.
Bug:
24247700
Change-Id: I541921da85bdabd907bfa9f75fbde7a3477ff593
Arman Uguray [Fri, 9 Oct 2015 19:32:55 +0000 (12:32 -0700)]
service/client: Add start-adv -u flag
Added the -u flag that allows passing a UUID in string representation
(16-bit, 32-bit, and 128-bit) to be advertised as long as all fields
fit inside the data.
Bug:
24247700
Change-Id: I3e572db31b84f1e010ba19ab5a51d00c563bb3b7
Arman Uguray [Wed, 7 Oct 2015 23:09:54 +0000 (16:09 -0700)]
service: Improve creating UUIDs from string
- When UUIDs are initialized from a 128-bit UUID, they are now parsed
from the canonical UUID string representation.
- Invalid strings now cause the UUID to be marked as invalid, rather than
causing a crash.
- Input such as "0x180d" is now valid.
- Added the GetShortestRepresentationSize() method to use in determining whether
a UUID is within Base BT SIG UUID domain.
Bug:
24247700
Change-Id: Id28255ec963bc6da27a8e871598016d41920b688
Pavlin Radoslavov [Tue, 13 Oct 2015 19:52:44 +0000 (19:52 +0000)]
am
ea6195da: am
3e88d02a: am
79d1678a: Add net_admin group capability to bluetoothtbd
* commit '
ea6195da8ce42ddfdf8e84e5463127c365f5c359':
Add net_admin group capability to bluetoothtbd
Pavlin Radoslavov [Tue, 13 Oct 2015 19:48:35 +0000 (19:48 +0000)]
am
3e88d02a: am
79d1678a: Add net_admin group capability to bluetoothtbd
* commit '
3e88d02a8523e90e25d0a2055abfbabca17f857a':
Add net_admin group capability to bluetoothtbd
Pavlin Radoslavov [Tue, 13 Oct 2015 19:43:30 +0000 (19:43 +0000)]
am
79d1678a: Add net_admin group capability to bluetoothtbd
* commit '
79d1678a7714cb457cdb3435db41ef2336bf429c':
Add net_admin group capability to bluetoothtbd
Pavlin Radoslavov [Tue, 13 Oct 2015 04:09:44 +0000 (21:09 -0700)]
Add net_admin group capability to bluetoothtbd
The net_admin group capability is needed for accessing the rfkill
device in the kernel.
Change-Id: Ic5c2c2717fbad6428fc75ff00a0a3afcd2c5dec6
Arman Uguray [Tue, 13 Oct 2015 15:32:47 +0000 (15:32 +0000)]
am
56e82aed: am
48d488d6: am
91c59c9f: service/client: Handle EOF
* commit '
56e82aed62b27e4f9b880b1c623761b0e0f8085d':
service/client: Handle EOF
Arman Uguray [Tue, 13 Oct 2015 15:27:40 +0000 (15:27 +0000)]
am
48d488d6: am
91c59c9f: service/client: Handle EOF
* commit '
48d488d6035b20d67f6763f408cd99bd2d84b77e':
service/client: Handle EOF
Arman Uguray [Tue, 13 Oct 2015 15:23:23 +0000 (15:23 +0000)]
am
91c59c9f: service/client: Handle EOF
* commit '
91c59c9febbf4a49664b8a06620d4a4882605131':
service/client: Handle EOF
Arman Uguray [Tue, 13 Oct 2015 15:06:46 +0000 (08:06 -0700)]
service/client: Handle EOF
Added handling for EOF to the REPL so we gracefully exit if
Ctrl+D is pressed.
Change-Id: I706f3f46a7092a30b1e9d83c32805dbefc5180c9
Arman Uguray [Tue, 13 Oct 2015 05:21:27 +0000 (05:21 +0000)]
am
9e5166c4: am
2ffa6718: am
f6fc0c48: service: Added Binder API documentation
* commit '
9e5166c4574ec8903afcb40d8a3be518d2ffa47f':
service: Added Binder API documentation
Arman Uguray [Tue, 13 Oct 2015 02:03:37 +0000 (02:03 +0000)]
am
2ffa6718: am
f6fc0c48: service: Added Binder API documentation
* commit '
2ffa67184bb825522c80a33f450de339fe289336':
service: Added Binder API documentation
Arman Uguray [Tue, 13 Oct 2015 01:56:17 +0000 (01:56 +0000)]
am
f6fc0c48: service: Added Binder API documentation
* commit '
f6fc0c48c2b4c8a9965f0f86275896da386ebdb2':
service: Added Binder API documentation