OSDN Git Service

android-x86/system-bt.git
6 years agoFix race conditions in a2dp sink am: 1a886d4d0b
Bailey Forrest [Wed, 25 Oct 2017 03:20:42 +0000 (03:20 +0000)]
Fix race conditions in a2dp sink am: 1a886d4d0b
am: 5a469d5120

Change-Id: Ia24d800850f65552b5fe2b719557de4dc7a17698

6 years agoFix race conditions in a2dp sink
Bailey Forrest [Wed, 25 Oct 2017 03:14:06 +0000 (03:14 +0000)]
Fix race conditions in a2dp sink
am: 1a886d4d0b

Change-Id: Iadc5e6f404e1fb90d81529cce5eb3b0f7bad37fc

6 years agoFix race conditions in a2dp sink
Bailey Forrest [Wed, 7 Jun 2017 21:55:37 +0000 (14:55 -0700)]
Fix race conditions in a2dp sink

- Use std::atomic for btif_a2dp_sink_state variable
- Add a lock for other static members

Explanation:
- There's the main thread that things on this file should run on:
  btif_a2dp_sink_cb.worker_thread
- External callers may call from any thread.
- fixed_queue_t is a thread safe queue which uses locking.

Many of the functions just append commands to cmd_msg_queue which are
commands which are processed by btif_a2dp_sink_command_ready. Operations
on this queue can be done without locking.

The main bug is a TOCTOU bug on 'rx_audio_queue'.

btif_a2dp_sink_avk_handle_timer preforms a fixed_queue_try_peek_first
operation and modifies the pointer without dequing it. This causes a
race when other operations cause a dequeue on rx_audio_queue.

I have added locks on all functions which modify the static data except:
- Helpers which are only called while locked
- Functions which only modify cmd_msg_queue or access
  btif_a2dp_sink_state

Bug: 35807779
Test: Test on device.
Change-Id: I289e23213426dbc182ca4a3fca26bc5658299381

6 years agoRemove aliase name while removing bonded device am: ce7c3c045f
liuchao [Tue, 24 Oct 2017 17:54:04 +0000 (17:54 +0000)]
Remove aliase name while removing bonded device am: ce7c3c045f
am: 2eb03c2bdb

Change-Id: I6dcd46df280e4e575d872fb946d4df870756ae0b

6 years agoRemove aliase name while removing bonded device
liuchao [Tue, 24 Oct 2017 17:51:31 +0000 (17:51 +0000)]
Remove aliase name while removing bonded device
am: ce7c3c045f

Change-Id: I705eaaed0caaa82671c57d624932110eb4262cc0

6 years agoRemove aliase name while removing bonded device
liuchao [Wed, 12 Apr 2017 02:23:00 +0000 (10:23 +0800)]
Remove aliase name while removing bonded device

when remove a bonded device, the date in bt_config.conf
is deleted but only removed linkey in the global cache.
The user set alise name is left there

When comes to next time search ,the linkey is set to
config and write to bt_config.conf, before OFF/ON BT
operation, the cached alse name is reported unexceptedly

After remove,the remote device is expected to be brand
new to the phone in the 2nd time they see each other.

Test: mm -j8
Change-Id: I005a6487c546e2639e3180e8a6e181c4d3c1d4ac

6 years agoGet Bluetooth Class of Device am: c5ed99ea41
Pulkit Bhuwalka [Tue, 24 Oct 2017 06:37:17 +0000 (06:37 +0000)]
Get Bluetooth Class of Device am: c5ed99ea41
am: 358d444925

Change-Id: I3b253ede8898ee546b2c454a4b8f4cabb596af28

6 years agoGet Bluetooth Class of Device
Pulkit Bhuwalka [Tue, 24 Oct 2017 06:27:46 +0000 (06:27 +0000)]
Get Bluetooth Class of Device
am: c5ed99ea41

Change-Id: I116fd9e1e74f10d8b51d41a058982add301c289e

6 years agoGet Bluetooth Class of Device
Pulkit Bhuwalka [Wed, 20 Sep 2017 22:11:01 +0000 (15:11 -0700)]
Get Bluetooth Class of Device

Modifies the native Bluetooth stack to
 1) return default value from BTA_DM_COD configuration when not set, and
 2) return adapter COD value even before stack start for Java Android
 stack.

Bug: 36015415
Test: Verified fetching of COD both before and after modification of
CoD value and restart of machine.

Change-Id: Ibcf726dcd7bea5d7e27c7a775f8cf7ea3f9e4107

6 years agoTEST: Fix host native test script am: 39555a3f0a
Jack He [Tue, 24 Oct 2017 03:31:43 +0000 (03:31 +0000)]
TEST: Fix host native test script am: 39555a3f0a
am: 44e8ccefc2

Change-Id: I66d621c9215a1a138faa26cfaaa455ab955cf7b1

6 years agoTEST: Fix host native test script
Jack He [Tue, 24 Oct 2017 03:29:10 +0000 (03:29 +0000)]
TEST: Fix host native test script
am: 39555a3f0a

Change-Id: I71ad38d426e69e6ff7edead0ea9f08db9d2da8fe

6 years agoTEST: Fix host native test script
Jack He [Mon, 23 Oct 2017 20:28:59 +0000 (13:28 -0700)]
TEST: Fix host native test script

* Use build/soong/soong_ui.bash to get needed environment variables
  instead of getting them directly from the parent shell
* Simplify the build command use to 'soong_ui.bash' directly so that
  we can remove the call to envsetup
* When ANDROID_BUILD_TOP is not set, try finding it by looking for
  build/soong/soong_ui.bash in all parent directories until found,
  and get TOP variable from it
* Similarly, for ANDROID_HOST_OUT, use the same soong_ui.bash script to
  get it, instead of relying on the environment variable
* Also fixed a bug in test log output by prepending DIST_DIR to the
  output file path so that it can be grabbed by the server

Bug: 64687730
Test: run run_host_unit_tests script in both
        1) vanilla environment without envsetup and lunch
        2) fulled setup and lunched environemt
      to verify
        1) If nothing is setup, the script picks a default environment
2) If envirnoment is already setup, use existing environment
   instead of creating new one

Change-Id: Ife28db509fe9af55cef26c7b480196efae39d3aa

6 years agoMake copyright headers consistent with Google template; remove "(C)" am: 5b790feeeb
Jakub Pawlowski [Tue, 24 Oct 2017 00:49:00 +0000 (00:49 +0000)]
Make copyright headers consistent with Google template; remove "(C)" am: 5b790feeeb
am: 6542d34e04

Change-Id: I6c1f1304657180708e24db24569d60aae09d18f0

6 years agoMake copyright headers consistent with Google template; remove "(C)"
Jakub Pawlowski [Tue, 24 Oct 2017 00:47:17 +0000 (00:47 +0000)]
Make copyright headers consistent with Google template; remove "(C)"
am: 5b790feeeb

Change-Id: I2caaf1d1455140ff0e2439584f2275c5ad0bb6e3

6 years agoMerge "GATT discovery refactor" am: ac1f273024
Jakub Pawlowski [Mon, 23 Oct 2017 22:53:09 +0000 (22:53 +0000)]
Merge "GATT discovery refactor" am: ac1f273024
am: 54e0f2a591

Change-Id: I6a1da110cdc7afdac9908ba66f4ed86111f62914

6 years agoMake copyright headers consistent with Google template; remove "(C)"
Jakub Pawlowski [Mon, 18 Sep 2017 16:00:20 +0000 (09:00 -0700)]
Make copyright headers consistent with Google template; remove "(C)"

Test: Comment changes only; still compiles...
Change-Id: Id699a8170112f06e4a2c9f2e0f0834d1817ace4e

6 years agoChange Bluetooth HID Profile Name (3/6) am: bb3d9f7e92
Hansong Zhang [Mon, 23 Oct 2017 22:47:19 +0000 (22:47 +0000)]
Change Bluetooth HID Profile Name (3/6) am: bb3d9f7e92
am: 1445c4e365

Change-Id: Ife5831eb65e4d2b8253973c053b0275cea8de6d5

6 years agoMerge "GATT discovery refactor"
Jakub Pawlowski [Mon, 23 Oct 2017 22:43:21 +0000 (22:43 +0000)]
Merge "GATT discovery refactor"
am: ac1f273024

Change-Id: Idbf9d442d70b5a4676a9bdc313b1c48ba5d0d648

6 years agoMerge "GATT discovery refactor"
Treehugger Robot [Mon, 23 Oct 2017 22:36:34 +0000 (22:36 +0000)]
Merge "GATT discovery refactor"

6 years agoChange Bluetooth HID Profile Name (3/6)
Hansong Zhang [Mon, 23 Oct 2017 22:35:06 +0000 (22:35 +0000)]
Change Bluetooth HID Profile Name (3/6)
am: bb3d9f7e92

Change-Id: I51e348da5f5aa2beb8be001c39c52c3b9f5eae0a

6 years agoGATT discovery refactor
Jakub Pawlowski [Tue, 10 Oct 2017 19:45:14 +0000 (12:45 -0700)]
GATT discovery refactor

Currently, when doing service discovery, we store pending discovery
content into tBTA_GATTC_ATTR_REC structure, and rewrite it into cache,
service after service during discovery.
From now on, we save discovery result directly into pending_discovery,
and at end of discovery we swap it with cache. This remove unncecessary
intermidiate step, and simplify the discovery.

Bug: 67057055
Test: GattReadTest
Change-Id: Id09026b6fb6df04eaf0a0ebefeb6e35b3d175f62

6 years agoChange Bluetooth HID Profile Name (3/6)
Hansong Zhang [Fri, 20 Oct 2017 22:56:54 +0000 (15:56 -0700)]
Change Bluetooth HID Profile Name (3/6)

Make the Bluetooth HID profile name consistent with the Bluetooth HID
service name.

BluetoothInputHost → BluetoothHidDevice
BluetoothInputDevice → BluetoothHidHost
IBluetoothInputHost → IBluetoothHidDevice
IBluetoothInputDevice → IBluetoothHidHost
BluetoothProfile.INPUT_HOST → BluetoothProfile.HID_DEVICE
BluetoothProfile.INPUT_DEVICE → BluetoothProfile.HID_HOST

(Cherry-picked from commit 1878072a45cb748f396a7b97f3c14aa983d41333)
Merged-In: I6bb5ad307f8ffb78cf5972aad68665372b85f0fe
Bug: 68055651
Test: make
Change-Id: I6bb5ad307f8ffb78cf5972aad68665372b85f0fe

6 years agoMerge "Use vector instead of list for keeping GATT database content" am: fb23789ef4
Jakub Pawlowski [Mon, 23 Oct 2017 19:14:41 +0000 (19:14 +0000)]
Merge "Use vector instead of list for keeping GATT database content" am: fb23789ef4
am: 53d97ac31d

Change-Id: I0fc674d978a9ee1421f574b70a5372388102b1e0

6 years agoMerge "Use vector instead of list for keeping GATT database content"
Jakub Pawlowski [Mon, 23 Oct 2017 19:12:38 +0000 (19:12 +0000)]
Merge "Use vector instead of list for keeping GATT database content"
am: fb23789ef4

Change-Id: Iffe7afeedcfc178442db4bfc16519bde8058dd31

6 years agoMerge "Use vector instead of list for keeping GATT database content"
Treehugger Robot [Mon, 23 Oct 2017 19:08:23 +0000 (19:08 +0000)]
Merge "Use vector instead of list for keeping GATT database content"

6 years agoRFCOMM: Return NULL when out of listen ports am: 21dcd19890
Myles Watson [Mon, 23 Oct 2017 17:35:02 +0000 (17:35 +0000)]
RFCOMM: Return NULL when out of listen ports am: 21dcd19890
am: aa999fb702

Change-Id: I243245e1f36dfdf1d5c52a022f8341209e7df276

6 years agoRFCOMM: Return NULL when out of listen ports
Myles Watson [Mon, 23 Oct 2017 17:32:29 +0000 (17:32 +0000)]
RFCOMM: Return NULL when out of listen ports
am: 21dcd19890

Change-Id: I90a6a56d103d3e47e79d0e349efc517c20e96e20

6 years agoUse vector instead of list for keeping GATT database content
Jakub Pawlowski [Mon, 23 Oct 2017 15:54:45 +0000 (08:54 -0700)]
Use vector instead of list for keeping GATT database content

We don't use any list features, but have to pay extra for it's features.
Replace with vector.

Bug: 67057055
Test: compilation
Change-Id: I4209c24b4f87780ea29e4e0707ce0a2a0d440d6b

6 years agoRFCOMM: Return NULL when out of listen ports
Myles Watson [Thu, 19 Oct 2017 22:30:29 +0000 (15:30 -0700)]
RFCOMM: Return NULL when out of listen ports

Bug: 67846163
Test: Connect RFCOMM ports until they fail
Change-Id: Ia6cdb5340f8565db0ca5538f8d8ae9c2f25e892e

6 years agoMerge "Restart legacy advertising after successfull connection" am: bd05a3edfc am...
Jakub Pawlowski [Sat, 21 Oct 2017 00:52:09 +0000 (00:52 +0000)]
Merge "Restart legacy advertising after successfull connection" am: bd05a3edfc am: b98ce5809e
am: 80ebfd2892

Change-Id: Iba8e04de3fce5fed879fa34646ac7f4109c2a8d5

6 years agoMerge "Restart legacy advertising after successfull connection" am: bd05a3edfc
Jakub Pawlowski [Sat, 21 Oct 2017 00:49:39 +0000 (00:49 +0000)]
Merge "Restart legacy advertising after successfull connection" am: bd05a3edfc
am: b98ce5809e

Change-Id: I76f5d107b8c277e694c005bb638e93f6a5ba4723

6 years agoMerge "Restart legacy advertising after successfull connection"
Jakub Pawlowski [Sat, 21 Oct 2017 00:47:05 +0000 (00:47 +0000)]
Merge "Restart legacy advertising after successfull connection"
am: bd05a3edfc

Change-Id: I870f744f4b30b4c7b5b9ae953804378f6fe61be4

6 years agoMerge "Restart legacy advertising after successfull connection"
Treehugger Robot [Sat, 21 Oct 2017 00:41:27 +0000 (00:41 +0000)]
Merge "Restart legacy advertising after successfull connection"

6 years agoMerge "test_vendor: Update clang-formatting" am: 8bbc80c58b am: 74d5857230
Myles Watson [Fri, 20 Oct 2017 22:25:32 +0000 (22:25 +0000)]
Merge "test_vendor: Update clang-formatting" am: 8bbc80c58b am: 74d5857230
am: 0cca46f26f

Change-Id: I25a9fdf1511ee99ab9109939fba023e3b88d8cef

6 years agoMerge "test_vendor: Update clang-formatting" am: 8bbc80c58b
Myles Watson [Fri, 20 Oct 2017 21:44:24 +0000 (21:44 +0000)]
Merge "test_vendor: Update clang-formatting" am: 8bbc80c58b
am: 74d5857230

Change-Id: Ib92b64fc302d131a33af351a85f7e95348e9126d

6 years agoMerge "test_vendor: Update clang-formatting"
Myles Watson [Fri, 20 Oct 2017 21:42:23 +0000 (21:42 +0000)]
Merge "test_vendor: Update clang-formatting"
am: 8bbc80c58b

Change-Id: I0977ad036027716bee20e1083f81234b65ae7ff3

6 years agoMerge "test_vendor: Update clang-formatting"
Treehugger Robot [Fri, 20 Oct 2017 21:36:29 +0000 (21:36 +0000)]
Merge "test_vendor: Update clang-formatting"

6 years agoRestart legacy advertising after successfull connection
Jakub Pawlowski [Fri, 20 Oct 2017 18:10:46 +0000 (11:10 -0700)]
Restart legacy advertising after successfull connection

Bug: 66139617
Test: run CTS Bluetooth LE Insecure Client Test
Change-Id: I894391f608d9ac7a625dc936cf27027fd3ab6140

6 years agoBuild only for current architecture by default am: 862095819f am: 94f53741c5
Jakub Pawlowski [Fri, 20 Oct 2017 18:02:44 +0000 (18:02 +0000)]
Build only for current architecture by default am: 862095819f am: 94f53741c5
am: ee99aab4ca

Change-Id: I2c28bfaaf74dec27b73920217ea949d07d72ee58

6 years agoRemove LD_LIBRARY_PATH from test/run_unit_test.sh am: 50e1adadad am: a0e46a75fc
Jakub Pawlowski [Fri, 20 Oct 2017 18:02:09 +0000 (18:02 +0000)]
Remove LD_LIBRARY_PATH from test/run_unit_test.sh am: 50e1adadad am: a0e46a75fc
am: 119071ae3b

Change-Id: I209acc41376b264dae6ade32011702a1b207f5da

6 years agoBuild only for current architecture by default am: 862095819f
Jakub Pawlowski [Fri, 20 Oct 2017 18:00:35 +0000 (18:00 +0000)]
Build only for current architecture by default am: 862095819f
am: 94f53741c5

Change-Id: I03bbbda1b1f1f8f13cd84131e61b64c62423c52a

6 years agoRemove LD_LIBRARY_PATH from test/run_unit_test.sh am: 50e1adadad
Jakub Pawlowski [Fri, 20 Oct 2017 18:00:08 +0000 (18:00 +0000)]
Remove LD_LIBRARY_PATH from test/run_unit_test.sh am: 50e1adadad
am: a0e46a75fc

Change-Id: Ied3935f47e6fb63a9469da3cffa323b70fdf9681

6 years agoBuild only for current architecture by default
Jakub Pawlowski [Fri, 20 Oct 2017 17:58:40 +0000 (17:58 +0000)]
Build only for current architecture by default
am: 862095819f

Change-Id: I1ad6723776dd2bd4bc5ae1afe330a28849550a9c

6 years agoRemove LD_LIBRARY_PATH from test/run_unit_test.sh
Jakub Pawlowski [Fri, 20 Oct 2017 17:58:08 +0000 (17:58 +0000)]
Remove LD_LIBRARY_PATH from test/run_unit_test.sh
am: 50e1adadad

Change-Id: I8c8ca6aba178c69c43f6862485f55db9eee3c66f

6 years agoBuild only for current architecture by default
Jakub Pawlowski [Fri, 20 Oct 2017 08:14:20 +0000 (01:14 -0700)]
Build only for current architecture by default

From now on, libbluetooth.so, and all unit tests will be compiled for
the current device platform only.

libbluetooth-types is an exception from rule, as some vendor libraries
are still compiled for 32bit.

Bug: 68028239
Test: compile and run Bluetooth
Change-Id: I51bb4da2a9e1e4e9a03c43f2825bd1dbd4a5ca58

6 years agoRemove LD_LIBRARY_PATH from test/run_unit_test.sh
Jakub Pawlowski [Fri, 20 Oct 2017 07:34:13 +0000 (00:34 -0700)]
Remove LD_LIBRARY_PATH from test/run_unit_test.sh

libbluetooth.so is now in default lib folder.

Bug: 67853426
Test: run tests using run_unit_test.sh
Change-Id: Ib3982d9600717593b817bda3553f53a629eb4afc

6 years agotest_vendor: Update clang-formatting
Myles Watson [Thu, 24 Aug 2017 22:04:19 +0000 (15:04 -0700)]
test_vendor: Update clang-formatting

Test: build
Change-Id: I40313b5df0dbed20e9d4afd4a7eac0083c644d7c

6 years agoFix out-of-bound array access in jv handle err log am: 3ddadcf4b0 am: 5fac4b595f
liuchao [Fri, 20 Oct 2017 17:21:34 +0000 (17:21 +0000)]
Fix out-of-bound array access in jv handle err log am: 3ddadcf4b0 am: 5fac4b595f
am: ded2081918

Change-Id: I5ff3aacd8b6f80261dec705551f1a10ca391d082

6 years agoFix out-of-bound array access in jv handle err log am: 3ddadcf4b0
liuchao [Fri, 20 Oct 2017 17:00:09 +0000 (17:00 +0000)]
Fix out-of-bound array access in jv handle err log am: 3ddadcf4b0
am: 5fac4b595f

Change-Id: I96ae8f057eba84c9f1f43d2f9f88a71d8849f4c9

6 years agoFix out-of-bound array access in jv handle err log
liuchao [Fri, 20 Oct 2017 16:58:02 +0000 (16:58 +0000)]
Fix out-of-bound array access in jv handle err log
am: 3ddadcf4b0

Change-Id: I2627ad5a4e864f520f340b9690ca3be2d4fd9681

6 years agoFix out-of-bound array access in jv handle err log
liuchao [Thu, 13 Apr 2017 03:45:02 +0000 (11:45 +0800)]
Fix out-of-bound array access in jv handle err log

Since the port_handle is checked invalid in bta_jv_rfc_port_to_cb
the error print of bta_jv_cb.port_cb[port_handle - 1].handle is
inappropriate

Test: mm -j8
Change-Id: I0562706512bb993d9a65676d11274d21fa9e70ef

6 years agoLinux: bluetooth.default.so -> libbluetooth.so am: 121882e23a am: 6b414af57a
Jakub Pawlowski [Fri, 20 Oct 2017 05:03:51 +0000 (05:03 +0000)]
Linux: bluetooth.default.so -> libbluetooth.so am: 121882e23a am: 6b414af57a
am: 945b11ee74

Change-Id: I659fbfbef0490ec5d1fe1f347510d062dd608a01

6 years agoLinux: bluetooth.default.so -> libbluetooth.so am: 121882e23a
Jakub Pawlowski [Fri, 20 Oct 2017 05:01:20 +0000 (05:01 +0000)]
Linux: bluetooth.default.so -> libbluetooth.so am: 121882e23a
am: 6b414af57a

Change-Id: I39ead37586d0900210b5ee32e66c1c15ea556c2d

6 years agoLinux: bluetooth.default.so -> libbluetooth.so
Jakub Pawlowski [Fri, 20 Oct 2017 04:59:51 +0000 (04:59 +0000)]
Linux: bluetooth.default.so -> libbluetooth.so
am: 121882e23a

Change-Id: I423eb28eaf7060c1966e0d4b944d25400478b674

6 years agoLinux: bluetooth.default.so -> libbluetooth.so
Jakub Pawlowski [Fri, 20 Oct 2017 02:51:57 +0000 (19:51 -0700)]
Linux: bluetooth.default.so -> libbluetooth.so

Also rename the build goal for both the library.

Bug: 67853426
Test: run Bluetooth
Change-Id: Ic5bd27f10ade0b068057049dd98c09e082cafee1

6 years agoClarify naming for characteristic value handle am: 8e16fd450f am: 4846596cee
Jakub Pawlowski [Fri, 20 Oct 2017 03:09:18 +0000 (03:09 +0000)]
Clarify naming for characteristic value handle am: 8e16fd450f am: 4846596cee
am: 55f0598cd7

Change-Id: Ie167e10e1eb6f3d778987810d8aaf20cb4576ae6

6 years agoClarify naming for characteristic value handle am: 8e16fd450f
Jakub Pawlowski [Fri, 20 Oct 2017 02:59:41 +0000 (02:59 +0000)]
Clarify naming for characteristic value handle am: 8e16fd450f
am: 4846596cee

Change-Id: Idda3dbc63dd5aa9b7a0ffd1ebb17468ecc6058b8

6 years agoClarify naming for characteristic value handle
Jakub Pawlowski [Fri, 20 Oct 2017 02:51:09 +0000 (02:51 +0000)]
Clarify naming for characteristic value handle
am: 8e16fd450f

Change-Id: I9d3aafaecfaf612180f9b592f376c5ecc7502bf3

6 years agoClarify naming for characteristic value handle
Jakub Pawlowski [Thu, 19 Oct 2017 22:51:35 +0000 (15:51 -0700)]
Clarify naming for characteristic value handle

We always reffer to characteristic by it's value handle.

Bug: 67057055
Test: compilation
Change-Id: I41a5d910ed471800c996b44dccfdbab3d7c3bdda

6 years agoMerge "Test: Rename performance_test to net_test_performance" am: a3341a0da2 am:...
Jack He [Thu, 19 Oct 2017 23:50:10 +0000 (23:50 +0000)]
Merge "Test: Rename performance_test to net_test_performance" am: a3341a0da2 am: be2fe53457
am: d096ddf8f8

Change-Id: Ib5c5e1fb79c9018f7cc7b1da249b95f226d835a4

6 years agoMerge "Test: Rename performance_test to net_test_performance" am: a3341a0da2
Jack He [Thu, 19 Oct 2017 23:45:03 +0000 (23:45 +0000)]
Merge "Test: Rename performance_test to net_test_performance" am: a3341a0da2
am: be2fe53457

Change-Id: I4d555e93b487ac660d7bf048bef72df3bf00cbfc

6 years agoMerge "Test: Rename performance_test to net_test_performance"
Jack He [Thu, 19 Oct 2017 23:42:56 +0000 (23:42 +0000)]
Merge "Test: Rename performance_test to net_test_performance"
am: a3341a0da2

Change-Id: I43226f193e427aa9be2e6a13decd1492a2bf2fc4

6 years agoMerge "Test: Rename performance_test to net_test_performance"
Treehugger Robot [Thu, 19 Oct 2017 23:38:51 +0000 (23:38 +0000)]
Merge "Test: Rename performance_test to net_test_performance"

6 years agohw/bluetooth.default.so -> libbluetooth.so (1/2) am: e56fabca98 am: 753a525a71
Jakub Pawlowski [Thu, 19 Oct 2017 22:05:02 +0000 (22:05 +0000)]
hw/bluetooth.default.so -> libbluetooth.so (1/2) am: e56fabca98 am: 753a525a71
am: 5de1beb431

Change-Id: I05c335629c63c18a4ef5d3e49a2ebcea4b0801ee

6 years agohw/bluetooth.default.so -> libbluetooth.so (1/2) am: e56fabca98
Jakub Pawlowski [Thu, 19 Oct 2017 22:01:56 +0000 (22:01 +0000)]
hw/bluetooth.default.so -> libbluetooth.so (1/2) am: e56fabca98
am: 753a525a71

Change-Id: Ib1f647ed741218e214846d3b3a3f18365b01650c

6 years agohw/bluetooth.default.so -> libbluetooth.so (1/2)
Jakub Pawlowski [Thu, 19 Oct 2017 21:59:20 +0000 (21:59 +0000)]
hw/bluetooth.default.so -> libbluetooth.so (1/2)
am: e56fabca98

Change-Id: I180079583d6f057827fad7f98e459c8e67ad931d

6 years agoTest: Rename performance_test to net_test_performance
Jack He [Thu, 19 Oct 2017 21:25:26 +0000 (14:25 -0700)]
Test: Rename performance_test to net_test_performance

Bug: 67059793
Test: make
Change-Id: I6303d4c367e465c8404538d904eabca80b509a16

6 years agohw/bluetooth.default.so -> libbluetooth.so (1/2)
Jakub Pawlowski [Thu, 19 Oct 2017 07:26:09 +0000 (00:26 -0700)]
hw/bluetooth.default.so -> libbluetooth.so (1/2)

Also rename the build goal for both the library and headers.

Bug: 67853426
Test: run Bluetooth
Merged-In: Iaffeebc1d3f2761e13f6d66d4e855dc342603054
Change-Id: Iaffeebc1d3f2761e13f6d66d4e855dc342603054
(cherry picked from commit 842ff8ed7f5b00d5f6da9d975f37e65c41bb8ebc)

6 years agoRevert "Add -fno-exceptions to default build config" am: da3c7c5761 am: 45b08792b3
Jack He [Thu, 19 Oct 2017 15:58:38 +0000 (15:58 +0000)]
Revert "Add -fno-exceptions to default build config" am: da3c7c5761 am: 45b08792b3
am: c573fa9454

Change-Id: Ie0cd43d0ea5798342c7cf31d130bf6f0ddab6299

6 years agoRevert "Add -fno-exceptions to default build config" am: da3c7c5761
Jack He [Thu, 19 Oct 2017 15:54:46 +0000 (15:54 +0000)]
Revert "Add -fno-exceptions to default build config" am: da3c7c5761
am: 45b08792b3

Change-Id: I293549eac9768296fc467b6e1789f5b57b4526bf

6 years agoRevert "Add -fno-exceptions to default build config"
Jack He [Thu, 19 Oct 2017 15:52:44 +0000 (15:52 +0000)]
Revert "Add -fno-exceptions to default build config"
am: da3c7c5761

Change-Id: Ife2b9647c90f664ed06ca2c48347deb69543907f

6 years agoRevert "Add -fno-exceptions to default build config"
Jack He [Thu, 19 Oct 2017 07:36:18 +0000 (07:36 +0000)]
Revert "Add -fno-exceptions to default build config"

This reverts commit d4b1d66dbe28818df3408a920ef37a3e0afca0aa.

Change Ie53b82e5d670f44a2460880c32dd9102d1caad7d
is a better fix. This flag won't disable exceptions in pre-compiled STL library.

Bug: 67963594
Test: build
Change-Id: I8c8cf0ebeb79bae697f0074de2d2e39f8e8f8703

6 years agoMerge "Fix failing ConfigTest" am: 939f86a83b am: 77ce187633
Jakub Pawlowski [Thu, 19 Oct 2017 08:40:27 +0000 (08:40 +0000)]
Merge "Fix failing ConfigTest" am: 939f86a83b am: 77ce187633
am: 39b0b22e26

Change-Id: I3856a0f650f6e71cc645487df5f6dcee567e4def

6 years agoRun clang-format on headers am: 3a3b82c37a am: 863b7d2aeb
Jakub Pawlowski [Thu, 19 Oct 2017 08:39:52 +0000 (08:39 +0000)]
Run clang-format on headers am: 3a3b82c37a am: 863b7d2aeb
am: 5420673ca7

Change-Id: I1b481eda5454f97311b21249c0810343c591f9da

6 years agoMerge "Fix failing ConfigTest" am: 939f86a83b
Jakub Pawlowski [Thu, 19 Oct 2017 08:37:52 +0000 (08:37 +0000)]
Merge "Fix failing ConfigTest" am: 939f86a83b
am: 77ce187633

Change-Id: If08ae193748ddb88c80b0a1038846c97ef0d0eb8

6 years agoRun clang-format on headers am: 3a3b82c37a
Jakub Pawlowski [Thu, 19 Oct 2017 08:37:23 +0000 (08:37 +0000)]
Run clang-format on headers am: 3a3b82c37a
am: 863b7d2aeb

Change-Id: Id5cd28c82debf97cac776acd85e2f61fe110e0bf

6 years agoMerge "Fix failing ConfigTest"
Jakub Pawlowski [Thu, 19 Oct 2017 08:35:27 +0000 (08:35 +0000)]
Merge "Fix failing ConfigTest"
am: 939f86a83b

Change-Id: I12576b3e14b08a4210f31f62a6e58752325eba95

6 years agoRun clang-format on headers
Jakub Pawlowski [Thu, 19 Oct 2017 08:34:59 +0000 (08:34 +0000)]
Run clang-format on headers
am: 3a3b82c37a

Change-Id: I675f4e2a685f9b60258e50a8f611fff4eead901d

6 years agoMerge "Fix failing ConfigTest"
Treehugger Robot [Thu, 19 Oct 2017 08:31:28 +0000 (08:31 +0000)]
Merge "Fix failing ConfigTest"

6 years agoFix failing ConfigTest
Jakub Pawlowski [Thu, 19 Oct 2017 06:55:39 +0000 (23:55 -0700)]
Fix failing ConfigTest

When running in cloud, different version of STL library is used. It
throws exceptions and make tests fail.

Bug: 67963594
Test: ConfigTest
Change-Id: Ie53b82e5d670f44a2460880c32dd9102d1caad7d

6 years agoRun clang-format on headers
Jakub Pawlowski [Thu, 19 Oct 2017 03:49:54 +0000 (20:49 -0700)]
Run clang-format on headers

Bug: 67853426
Test: compilation
Change-Id: I37dcac01e78fafb4ef0c7e97578d04605c46e88e

6 years agoMove Bluetooth headers to system/bt (1/3) am: f2f207a91c am: 747aaebe50
Jakub Pawlowski [Thu, 19 Oct 2017 01:19:39 +0000 (01:19 +0000)]
Move Bluetooth headers to system/bt (1/3) am: f2f207a91c am: 747aaebe50
am: c2bfcdc5c8

Change-Id: Ib56349cb1cd9725704ec66a12e6bb6a7434744ac

6 years agoMove Bluetooth headers to system/bt (1/3) am: f2f207a91c
Jakub Pawlowski [Thu, 19 Oct 2017 01:16:38 +0000 (01:16 +0000)]
Move Bluetooth headers to system/bt (1/3) am: f2f207a91c
am: 747aaebe50

Change-Id: Idad497bec7e66fb8df342629102cd4b1c20213ff

6 years agoMove Bluetooth headers to system/bt (1/3)
Jakub Pawlowski [Thu, 19 Oct 2017 01:13:04 +0000 (01:13 +0000)]
Move Bluetooth headers to system/bt (1/3)
am: f2f207a91c

Change-Id: Ie868592d777af9e437268e5ed7f8c5ffbc7cd4f6

6 years agoMove Bluetooth headers to system/bt (1/3)
Jakub Pawlowski [Sat, 23 Sep 2017 21:47:20 +0000 (14:47 -0700)]
Move Bluetooth headers to system/bt (1/3)

Bug: 67853426
Test: run Bluetooth
Change-Id: I75748d29a35d10d377d39e0441116dbfd04c82e9

6 years agoMerge "Remove tabs from build/Android.bp" am: aefc19af02 am: 3d999cd30e
Jack He [Thu, 19 Oct 2017 00:07:59 +0000 (00:07 +0000)]
Merge "Remove tabs from build/Android.bp" am: aefc19af02 am: 3d999cd30e
am: c2f3c1b12c

Change-Id: I04807021266a5362bd20d828fa1bbd157798c4b5

6 years agoMerge "Remove tabs from build/Android.bp" am: aefc19af02
Jack He [Thu, 19 Oct 2017 00:04:15 +0000 (00:04 +0000)]
Merge "Remove tabs from build/Android.bp" am: aefc19af02
am: 3d999cd30e

Change-Id: I22bb3d823a0731d57c23ca1d3daa3102053ca537

6 years agoMerge "Remove tabs from build/Android.bp"
Jack He [Thu, 19 Oct 2017 00:02:15 +0000 (00:02 +0000)]
Merge "Remove tabs from build/Android.bp"
am: aefc19af02

Change-Id: Ic69e5fc6301734caba9f3037fd35829596909af9

6 years agoMerge "Remove tabs from build/Android.bp"
Treehugger Robot [Wed, 18 Oct 2017 23:58:28 +0000 (23:58 +0000)]
Merge "Remove tabs from build/Android.bp"

6 years agoMerge "HID: Fix the behavior of virtual_cable_unplug" am: 0d53533bc9 am: 9ab36bf1c9
Hansong Zhang [Wed, 18 Oct 2017 23:51:45 +0000 (23:51 +0000)]
Merge "HID: Fix the behavior of virtual_cable_unplug" am: 0d53533bc9 am: 9ab36bf1c9
am: 75c9dd7e2d

Change-Id: Ifa82e8de9f928efbc902039591a73df46c874a73

6 years agoMerge "HID: Fix the behavior of virtual_cable_unplug" am: 0d53533bc9
Hansong Zhang [Wed, 18 Oct 2017 23:49:16 +0000 (23:49 +0000)]
Merge "HID: Fix the behavior of virtual_cable_unplug" am: 0d53533bc9
am: 9ab36bf1c9

Change-Id: Id0be13329da834b1d316c3b47a13ba165b8a932d

6 years agoMerge "HID: Fix the behavior of virtual_cable_unplug"
Hansong Zhang [Wed, 18 Oct 2017 23:47:13 +0000 (23:47 +0000)]
Merge "HID: Fix the behavior of virtual_cable_unplug"
am: 0d53533bc9

Change-Id: Ifc3c089a43d514e160f6b32877ebe0c4248b4437

6 years agoMerge "HID: Fix the behavior of virtual_cable_unplug"
Treehugger Robot [Wed, 18 Oct 2017 23:39:41 +0000 (23:39 +0000)]
Merge "HID: Fix the behavior of virtual_cable_unplug"

6 years agoMerge "Do not set random address when public address is in use" am: b64989c191 am...
Jakub Pawlowski [Wed, 18 Oct 2017 22:57:39 +0000 (22:57 +0000)]
Merge "Do not set random address when public address is in use" am: b64989c191 am: d0b58b1f1c
am: d3ee3a3eda

Change-Id: Iafb37431b6f942430316649926b2c5c31efcace3

6 years agoMerge "Add -fno-exceptions to default build config" am: 9c9a4bc800 am: cac04d9815
Jack He [Wed, 18 Oct 2017 22:56:42 +0000 (22:56 +0000)]
Merge "Add -fno-exceptions to default build config" am: 9c9a4bc800 am: cac04d9815
am: 4303ca437a

Change-Id: I6a0843adc0007290fe98a94c985c93a3d085a32f

6 years agoMerge "Do not set random address when public address is in use" am: b64989c191
Jakub Pawlowski [Wed, 18 Oct 2017 22:52:10 +0000 (22:52 +0000)]
Merge "Do not set random address when public address is in use" am: b64989c191
am: d0b58b1f1c

Change-Id: If965db3eceace9764fcd438e0d309497ff3ab7ac

6 years agoMerge "Do not set random address when public address is in use"
Jakub Pawlowski [Wed, 18 Oct 2017 22:50:13 +0000 (22:50 +0000)]
Merge "Do not set random address when public address is in use"
am: b64989c191

Change-Id: Ie1ed12ba0f06f77abb4248ca94ba062a61c9e13c

6 years agoMerge "Do not set random address when public address is in use"
Treehugger Robot [Wed, 18 Oct 2017 22:45:37 +0000 (22:45 +0000)]
Merge "Do not set random address when public address is in use"

6 years agoMerge "Add -fno-exceptions to default build config" am: 9c9a4bc800
Jack He [Wed, 18 Oct 2017 22:22:37 +0000 (22:22 +0000)]
Merge "Add -fno-exceptions to default build config" am: 9c9a4bc800
am: cac04d9815

Change-Id: I06a91033e7ccb06fe04b2300e8705a7d9d3b2b40

6 years agoRemove tabs from build/Android.bp
Jack He [Wed, 18 Oct 2017 22:18:24 +0000 (15:18 -0700)]
Remove tabs from build/Android.bp

Test: make
Change-Id: I02dc1cf5a5e6c0ed2df60fcc3fb79edbb026cf8c