Mattias Nissler
087f89d4a0
Merge "Split NVRAM HAL header to break out types and constants."
2016-02-09 13:14:40 +00:00
Darren Krahn
f8521f8b3c
Merge "nvram: Add const to input-only arrays."
2016-02-05 18:14:04 +00:00
Mattias Nissler
d2d0b67259
Split NVRAM HAL header to break out types and constants.
...
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-05 09:50:23 +01:00
Darren Krahn
ab3ea641ab
nvram: Add const to input-only arrays.
...
BUG=24397987
Change-Id: I534a8fc978e10e1277cb0c87b5942d182f7c2a79
2016-02-04 14:47:14 -08:00
Dan Willemsen
5cfc02e4b1
Merge "Remove header from LOCAL_SRC_FILES"
2016-02-02 04:35:05 +00:00
Dan Willemsen
d0c1f170d6
Remove header from LOCAL_SRC_FILES
...
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-02-01 19:33:33 -08:00
Andre Eisenbach
94eebcfa77
Merge "Add get_gatt_db to Bluetooth HAL"
2016-01-29 21:05:49 +00:00
Jakub Pawlowski
f2e1352d6c
Add get_gatt_db to Bluetooth HAL
...
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-29 20:13:15 +00:00
Shawn Willden
f704e8a939
Merge "Add KM_TAG_ALLOW_WHILE_ON_BODY."
2016-01-28 23:20:01 +00:00
Darren Krahn
6b09c49633
Merge "Add header for new NVRAM HAL."
2016-01-28 01:39:35 +00:00
Marie Janssen
df4555d18d
Merge "Add arguments to native dumpsys support"
2016-01-27 20:42:08 +00:00
Marie Janssen
32d45dd020
Add arguments to native dumpsys support
...
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-27 17:49:32 +00:00
Shawn Willden
71ca0109be
Add KM_TAG_ALLOW_WHILE_ON_BODY.
...
Change-Id: I39ca0eee8be46a6acc65e975aad81d2f2c2aa5b8
2016-01-26 07:34:48 -07:00
Shawn Willden
0c5612db38
Merge "Add keymaster2 HAL."
2016-01-25 17:33:00 +00:00
Shawn Willden
cf30fe17fd
Add keymaster2 HAL.
...
Change-Id: Ibfcda30f33077f61e74701fa026983f9e72e140e
2016-01-21 12:19:31 -07:00
Adam Lesinski
87882cc0f2
Merge "Add Bluetooth network traffic accounting to HAL API"
2016-01-21 02:23:51 +00:00
Adam Lesinski
e2d316d2c9
Add Bluetooth network traffic accounting to HAL API
...
Introduces a UID traffic struct and includes it in the API
for querying energy usage data.
Also adds the calling UID as a parameter for starting sockets
so that network traffic can be tracked.
Bug:26039657
Change-Id: I9f4a130adc2846467063e7a9a4ea2231af06a80b
2016-01-20 16:47:00 -08:00
Sanket Agarwal
c045e7b8ca
Merge "Bluetooth: A2DP sink interface for Audio Focus change and AVRCP 1.3"
2016-01-20 00:23:38 +00:00
AnubhavGupta
eacdbc8b6d
Bluetooth: A2DP sink interface for Audio Focus change and AVRCP 1.3
...
- Add interface to report audio focus change from Bluetooth Apk
to media task for A2DP Sink scenarios.
- Add interface to request audiofocus from system/bt.
- Add interfaces for AVRCP 1.3.
Change-Id: I687ea7be460b3ee3b082db9264621e2e24d04c0c
2016-01-19 14:30:45 -08:00
Darren Krahn
a59143bc44
Add header for new NVRAM HAL.
...
This HAL abstracts implementations of non-volatile storage with
hardware-backed access controls.
BUG=24397987
Change-Id: Ia9935b138a7ad3e931c54e590570d233c9036e0f
2016-01-19 09:34:25 -08:00
Andre Eisenbach
6815181c0b
Merge "Add structure for holding Bluetooth OOB data."
2016-01-07 23:31:52 +00:00
Jakub Pawlowski
00202fff5a
Add structure for holding Bluetooth OOB data.
...
Change-Id: I0f59bf6343e519a7da830f57d242f9bdf18fca93
2015-12-30 19:50:03 +00:00
Andreas Gampe
de5662d7fa
Merge "Libhardware: Fix tests"
2015-12-17 00:57:30 +00:00
Andreas Gampe
1aa58f9ef9
Libhardware: Fix tests
...
Fix some warnings. Silence another. Less build noise.
Change-Id: Ibdbba093c2aca45343bfbe72c551b15d0f94e1b5
2015-12-16 15:53:35 -08:00
David Zeuthen
e96eb0ddda
Merge "libhardware: boot_control: Add isSlotMarkedSuccesful() function."
2015-12-09 20:58:58 +00:00
David Zeuthen
f73b52393c
Merge "libhardware: boot_control: Clarify documentation for isSlotBootable()."
2015-12-09 15:01:18 +00:00
David Zeuthen
72c88c915d
libhardware: boot_control: Add isSlotMarkedSuccesful() function.
...
This is useful in cases where the OS need to do some work (verification,
JIT'ing etc.) before it's ready to mark a slot as successful.
Change-Id: I114cfb7cf89ee227b186c56347446c850986d0b1
2015-12-09 09:59:39 -05:00
David Zeuthen
45131be338
libhardware: boot_control: Clarify documentation for isSlotBootable().
...
The documentation for this method is clearly wrong and it confused
several implementors.
Change-Id: I0427abcf87d0c8955ea1168513e6b9ab85380bf2
2015-12-08 13:16:55 -05:00
Shawn Willden
7adb2d457c
Merge "ECIES: adding ECIES-KEM"
...
am: 3aa7935ef2
* commit '3aa7935ef24946c1aa6db6c04fea10f39453c450':
ECIES: adding ECIES-KEM
2015-11-23 16:30:51 +00:00
Shawn Willden
3aa7935ef2
Merge "ECIES: adding ECIES-KEM"
2015-11-23 16:27:03 +00:00
Thai Duong
40d59c8155
ECIES: adding ECIES-KEM
...
Change-Id: Iea5877eba0a9b13610d3d1b33d04b5657edc3550
2015-11-23 06:41:33 -07:00
Eino-Ville Talvala
297e586c29
Merge "Camera: Fix Metadata static info intialization"
...
am: f7b855ac28
* commit 'f7b855ac2813e5593db48ba9ba1002f3d56d38b8':
Camera: Fix Metadata static info intialization
2015-11-17 23:39:13 +00:00
Eino-Ville Talvala
f7b855ac28
Merge "Camera: Fix Metadata static info intialization"
2015-11-17 23:34:40 +00:00
Colin Cross
1dc2265379
Merge "Vibrator: clarify the API"
...
am: 8447aed332
* commit '8447aed33271c3f53849923327d6cfa3f4999e09':
Vibrator: clarify the API
2015-11-17 19:53:02 +00:00
Colin Cross
8447aed332
Merge "Vibrator: clarify the API"
2015-11-17 19:31:22 +00:00
Jacopo Mondi
2ecebbf8ff
Camera: Fix Metadata static info intialization
...
The Metadata module segfaults when asked to initialize camera_info, upon
camera description request coming from framework.
This was caused by missing intialization of mData instance field.
Additionally, when intializing it with a template metadata, the
validation function return value was wrongly tested
Patchset 2: Do not init mData but let function flow take care of
replacing it after adding new data to it fails.
Change-Id: Iae228f0d66171ed3eac430186ced4d9b023f8de8
Signed-off-by: Jacopo Mondi <jacopo.mondi@linaro.org>
2015-11-17 09:46:40 +01:00
Aravind Akella
87f6141397
am 29b03118
: am 1ce7fe6b
: Merge "Fix DATA_INJECTION flag in sensors.h" into mnc-dr-dev
...
* commit '29b0311870b151fb93420ac0844b87855346a807':
Fix DATA_INJECTION flag in sensors.h
2015-10-14 21:19:58 +00:00
Aravind Akella
29b0311870
am 1ce7fe6b
: Merge "Fix DATA_INJECTION flag in sensors.h" into mnc-dr-dev
...
* commit '1ce7fe6b0a887edc6fad8e3386ab8e28a5f0d107':
Fix DATA_INJECTION flag in sensors.h
2015-10-14 21:08:12 +00:00
Aravind Akella
1ce7fe6b0a
Merge "Fix DATA_INJECTION flag in sensors.h" into mnc-dr-dev
2015-10-14 21:03:13 +00:00
Andy Hung
f25c47fe39
am 9a2f2ef1
: am 419c27b9
: Do not reset out_get_presentation_position() to 0 on standby
...
* commit '9a2f2ef14f6655cb4f71edca2553bbad3cc62795':
Do not reset out_get_presentation_position() to 0 on standby
2015-10-14 01:28:33 +00:00
Andy Hung
9a2f2ef14f
am 419c27b9
: Do not reset out_get_presentation_position() to 0 on standby
...
* commit '419c27b937b1628340985ac27f1d577e41b9a60e':
Do not reset out_get_presentation_position() to 0 on standby
2015-10-14 01:18:31 +00:00
Andy Hung
419c27b937
Do not reset out_get_presentation_position() to 0 on standby
...
Bug: 21199150
Bug: 23080499
Change-Id: I749b331bfce8cfe27b16bb2fce14f23816fb48ce
2015-10-13 11:41:02 -07:00
Michael Wright
87dd605117
am 70097605
: am 147d5404
: Define the data parameter for POWER_HINT_INTERACTION.
...
* commit '7009760593d457902fed7d90fe924cf20f3d0604':
Define the data parameter for POWER_HINT_INTERACTION.
2015-09-22 18:35:25 +00:00
Michael Wright
7009760593
am 147d5404
: Define the data parameter for POWER_HINT_INTERACTION.
...
* commit '147d5404f5958133c291cc26adb5a781d7ac2ea8':
Define the data parameter for POWER_HINT_INTERACTION.
2015-09-22 18:21:00 +00:00
Shawn Willden
cd2fff40a9
am 94e514eb
: am e5a69c0d
: Merge "Correct keymaster1 documentation."
...
* commit '94e514eb78714edd9267822a00b688b52ceeceeb':
Correct keymaster1 documentation.
2015-09-17 00:50:55 +00:00
Shawn Willden
94e514eb78
am e5a69c0d
: Merge "Correct keymaster1 documentation."
...
* commit 'e5a69c0de7994a77653adda6a26f3e84f5bf81f4':
Correct keymaster1 documentation.
2015-09-17 00:41:22 +00:00
Shawn Willden
e5a69c0de7
Merge "Correct keymaster1 documentation."
2015-09-17 00:32:35 +00:00
Shawn Willden
87e8070a7b
Correct keymaster1 documentation.
...
Bug: 22291207
Change-Id: Ib0b54d40d04ef3bb2fca6bf65d005b5432782482
2015-09-16 18:03:00 -06:00
Michael Wright
147d5404f5
Define the data parameter for POWER_HINT_INTERACTION.
...
Change-Id: I86857c1ea92082de109c612080e47c9c9835726b
2015-09-16 23:36:12 +01:00
Shawn Willden
06926a5777
am 1257a2aa
: am d527792f
: Merge "Add KM_TAG_MIN_MAC_LENGTH."
...
* commit '1257a2aa9beefd7cd581ba69173890b07303ef8b':
Add KM_TAG_MIN_MAC_LENGTH.
2015-09-11 23:04:52 +00:00