summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-07-13Merge "Begin converting Android.mk to Android.bp"android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Dan Willemsen
2016-07-12Begin converting Android.mk to Android.bpDan Willemsen
These modules have their dependencies satisfied. Change-Id: I67986efd7478e477770bedac72ab35a407e3d06a
2016-06-30Merge "Fix google-explicit-constructor warnings in libhardware"Chih-hung Hsieh
2016-06-30Fix google-explicit-constructor warnings in libhardwareChih-Hung Hsieh
Bug: 28341362 Change-Id: I29a56734e54740e4b15fe2f6cacbbd867163ae79 Test: build with clang-tidy
2016-06-21Merge "[qemu]: Remove qemu_pipe.h and qemud.h headers."David Turner
2016-06-20Merge "Vectors as parameters to GATT (3/3)"Jakub Pawlowski
2016-06-20Vectors as parameters to GATT (3/3)Jakub Pawlowski
Bug: 29005882 Bug: 28485365 Change-Id: I1272dce1e9480c9e6f45bc39f21d034c59728482
2016-06-20Merge "Vectors as parameters to GATT write/indicate (3/3)"Jakub Pawlowski
2016-06-16[qemu]: Remove qemu_pipe.h and qemud.h headers.David 'Digit' Turner
These headers do not correspond to loadable HAL modules or corresponding support code so must be removed from here. <hardware/qemu_pipe.h> is removed and replaced by a new header named <system/qemu_pipe.h> that provides a slightly different API. <hardware/qemud.h> is a header providing a wrapper around qemu pipes for old emulator-specific code that relied on the obsolete 'qemud' daemon. It can be removed by changing all clients to use <system/qemu_pipe.h> instead. BUG=25875346 Change-Id: I72242bbe8598164e0c9fee17dfa91ea97f9ad914
2016-06-15Vectors as parameters to GATT write/indicate (3/3)Jakub Pawlowski
Bug: 29005882 Bug: 28485365 Change-Id: I39b0d746692a23be89551979488a28cfe930866a
2016-06-14Merge "Use UINT16 for GATT attribute id field"Treehugger Robot
2016-06-14Use UINT16 for GATT attribute id fieldJakub Pawlowski
Id field is equal to attribute handle, so it must be 16bits. Otherwise only piece of GATT database can be used. Bug: 29253825 Change-Id: I75c0c993a987bf0a48e910fa3c0f41f9d876bec6 (cherry picked from commit 7dde9350e61acf97b98e9078972548f07e6a9400)
2016-05-16Merge "Fix misc-macro-parentheses warnings."android-n-preview-4Chih-hung Hsieh
2016-05-12Fix misc-macro-parentheses warnings.Chih-Hung Hsieh
Bug: 28705665 Change-Id: Ie514abfe12bea065658da3706aad8b4c9c0a93c7
2016-05-04Merge "Fix google-explicit-constructor warnings."android-wear-n-preview-3android-wear-n-preview-1android-n-preview-3Chih-hung Hsieh
2016-05-02Fix google-explicit-constructor warnings.Chih-Hung Hsieh
Bug: 28341362 Change-Id: Ica5b2c67b008a03aeaeb35d44b8d19632f8f30a4
2016-04-19Merge "Add guest mode functionality (3/4)"Ajay Panicker
2016-04-18Add guest mode functionality (3/4)Ajay Panicker
Add a flag to enable() to start Bluetooth in restricted mode. In restricted mode, all devices that are paired during restricted mode are deleted upon leaving restricted mode. Right now restricted mode is only entered while a guest user is active Bug: 27410683 Change-Id: Ibededbdb832275db4b6e78af83d26754f8b5a9ec
2016-04-15Merge "Add interface for focus gain in A2DP SNK audio track."Treehugger Robot
2016-04-15Add interface for focus gain in A2DP SNK audio track.Sanket Agarwal
Bug: b/28065071 Change-Id: If5d3f197ac2e8d73f3f2e8edf764c84e5e08e6e8
2016-03-24Merge "vibrator: add support to use led-trigger interface"android-n-preview-2Dmitry Shmidt
2016-03-22vibrator: add support to use led-trigger interfaceRob Herring
The existing vibrator HAL uses the timed_output interface which will never be moved out of kernel's staging tree. The kernel already has a similar feature with GPIO controlled LEDs and LED triggers. While a vibrator is not an LED, the control model is the same and can be reused. Additionally, DT bindings already exist for GPIO controlled LEDs. This adds support for the LED device in addition to the timed_output device. It uses the "transient" trigger for the LED device named "vibrator". Change-Id: I90d52d6e50d83d255f484db148064069504f78e0 Signed-off-by: Rob Herring <robh@kernel.org>
2016-03-22Merge "Use handles to identify GATT attributes (2/4)"Andre Eisenbach
2016-03-22Use handles to identify GATT attributes (2/4)Jakub Pawlowski
Bug: 27778668 Change-Id: Iff64153c2b783705fb4408f9911b13fa44af4f84
2016-03-22Merge "Bluetooth: Additional status codes for wakelock ops"Andre Eisenbach
2016-03-21Bluetooth: Additional status codes for wakelock opsAndre Eisenbach
Add additional status codes to better track wakelock acquisition or release failures. Bug: 27721443 Change-Id: I99fb442277dac81df0d84d9a9f7a3340158377a8
2016-03-10Merge "nvram: Add a get_max_space_size_in_bytes method."Darren Krahn
2016-03-08nvram: Add a get_max_space_size_in_bytes method.Darren Krahn
This is useful for the Access-Controlled NVRAM HAL because implementations may be able to achieve atomic writes if they are able to limit the maximum space size. This method allows the module to report that it is imposing such a limit. BUG=27480753 Change-Id: Ia70f459d7d5fca894e52310ddb2cdcbb51bd8364
2016-03-04Merge "Remove unused methods and callbacks"Jakub Pawlowski
am: 5f735636de * commit '5f735636de456c2a5fdf0bb9728778607662bd53': Remove unused methods and callbacks
2016-03-03Merge "Remove unused methods and callbacks"android-n-preview-1Andre Eisenbach
2016-03-03Remove unused methods and callbacksJakub Pawlowski
Bug: 27455533 Change-Id: Id2e265be02dc627e7fc81875c3000262cab2e35f
2016-02-17Merge commit '801439d8aafef69d027ec417919d128a58e1c42f' into HEADBill Yi
2016-02-16Merge "Add ability to add interop entries dynamically (1/2)"brillo-m10-releasebrillo-m10-devAndre Eisenbach
2016-02-15Add ability to add interop entries dynamically (1/2)Andre Eisenbach
Add ability and interface for adding dynamic entries to the interop workaround database. Bug: 26548845 Change-Id: I17f8cbdf1e63c316aa52903be7ec526c9b1376bb
2016-02-12Merge "Add new callbacks to bt_gatt_client."Andre Eisenbach
2016-02-12Add new callbacks to bt_gatt_client.Jakub Pawlowski
Add services removed and services added callbacks Change-Id: Id6abeb78207bd761969ee2ffc94f96f71dd20084
2016-02-09Merge "Split NVRAM HAL header to break out types and constants."Mattias Nissler
2016-02-05Merge "nvram: Add const to input-only arrays."Darren Krahn
2016-02-05Split NVRAM HAL header to break out types and constants.Mattias Nissler
This allows inclusion of the new nvram_defs.h header to pull in NVRAM types and constants without pulling in hardware.h, which is difficult in low-level environments such as Trusty (and the full NVRAM HAL header isn't useful in that environment anyways). Change-Id: I023104ec666832d4e01ae8841a4d6407a5b04643
2016-02-04nvram: Add const to input-only arrays.Darren Krahn
BUG=24397987 Change-Id: I534a8fc978e10e1277cb0c87b5942d182f7c2a79
2016-02-02Merge "Remove header from LOCAL_SRC_FILES"Dan Willemsen
2016-02-01Remove header from LOCAL_SRC_FILESDan Willemsen
The build system does not use headers in LOCAL_SRC_FILES. To prevent typos, it's now a warning to add something to LOCAL_SRC_FILES that is not used. Change-Id: Ieb6c6d383c04005077043d04f1b4985964ef0341
2016-01-29Merge "Add get_gatt_db to Bluetooth HAL"Andre Eisenbach
2016-01-29Add get_gatt_db to Bluetooth HALJakub Pawlowski
This patch adds new method, get_gatt_db to bluetooth HAL. It can be used to grab whole GATT database in one request. It will trigger get_gatt_db_callback, which is also part of this patch. Change-Id: I1a931f126db56e7a29537f3bca9cddff3dd27dc6
2016-01-28Merge "Add KM_TAG_ALLOW_WHILE_ON_BODY."Shawn Willden
2016-01-28Merge "Add header for new NVRAM HAL."Darren Krahn
2016-01-27Merge "Add arguments to native dumpsys support"Marie Janssen
2016-01-27Add arguments to native dumpsys supportMarie Janssen
Arguments are passed through in order to support metrics logging and future support for other dumpsys support in the native daemon. Change-Id: Icaa75b9f36cca7e2dd2ceb5f94b27dec657d34e4
2016-01-26Add KM_TAG_ALLOW_WHILE_ON_BODY.Shawn Willden
Change-Id: I39ca0eee8be46a6acc65e975aad81d2f2c2aa5b8
2016-01-25Merge "Add keymaster2 HAL."Shawn Willden
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 18:20:19 +0000