OSDN Git Service
Wonsik Kim [Thu, 17 Dec 2015 07:05:52 +0000 (07:05 +0000)]
Merge "tv_input: add signal detection flag to stream config"
Ruben Brunk [Thu, 17 Dec 2015 02:58:47 +0000 (02:58 +0000)]
Merge "Update lights HAL to include low-persistence mode."
Ruben Brunk [Tue, 15 Dec 2015 23:42:11 +0000 (15:42 -0800)]
Update lights HAL to include low-persistence mode.
Bug:
22855417
Change-Id: Ie76430025157930a3d824b7f18b5e23ba7d92f12
Steve Paik [Wed, 16 Dec 2015 02:38:48 +0000 (02:38 +0000)]
Revert "Add VEHICLE_HVAC_FAN_DIRECTION_FACE_AND_FLOOR_FLAG"
This reverts commit
ba48c5d3d366443a192297a17a585ee18080dda5.
Change-Id: I597222922a1d8fb80558cf090a0c7ce2b94e521e
Steve Paik [Tue, 15 Dec 2015 21:22:38 +0000 (13:22 -0800)]
Add VEHICLE_HVAC_FAN_DIRECTION_FACE_AND_FLOOR_FLAG
Change-Id: Ic7769f7d2af0a0d3a028a0b4ac105855f24d5938
(cherry picked from commit
b6de2ef388d0573044e940c405d7d87240b01ca4)
Steve Paik [Thu, 10 Dec 2015 22:58:27 +0000 (14:58 -0800)]
Add more HVAC parameters to support TDK
Added new parameters:
- max AC
- max defrost
- recirc
- dual
Also added fan direction enum.
Change-Id: I887a5272bdd310cb7aed014489dacc901d4731d0
(cherry picked from commit
4e3891829cedd60ce5e8b609313458835b4cea1b)
David Zeuthen [Thu, 10 Dec 2015 06:27:57 +0000 (22:27 -0800)]
Merge "libhardware: boot_control: Add isSlotMarkedSuccesful() function." am:
e96eb0ddda
am:
d8bc07cdce
* commit '
d8bc07cdce442fc42e3fd4250b6c6c4e9a42c9d3':
libhardware: boot_control: Add isSlotMarkedSuccesful() function.
Keun-young Park [Thu, 10 Dec 2015 01:00:08 +0000 (01:00 +0000)]
Merge "add clarification on parameter passing in get call"
Keun-young Park [Wed, 9 Dec 2015 21:47:30 +0000 (13:47 -0800)]
add clarification on parameter passing in get call
- with errata fix
- also removed build warnings from vehicle.c
bug:
25183740
Change-Id: I6e0ed9e300e4bc5ff8821cca87ff8509ffc0968a
David Zeuthen [Wed, 9 Dec 2015 21:08:30 +0000 (21:08 +0000)]
Merge "libhardware: boot_control: Add isSlotMarkedSuccesful() function."
am:
e96eb0ddda
* commit '
e96eb0dddaa0c248e324a0e9f5dacc8eef646773':
libhardware: boot_control: Add isSlotMarkedSuccesful() function.
David Zeuthen [Wed, 9 Dec 2015 20:58:58 +0000 (20:58 +0000)]
Merge "libhardware: boot_control: Add isSlotMarkedSuccesful() function."
David Zeuthen [Wed, 9 Dec 2015 15:09:21 +0000 (15:09 +0000)]
Merge "libhardware: boot_control: Clarify documentation for isSlotBootable()." am:
f73b52393c
am:
8d7bfc600d
* commit '
8d7bfc600d7ef054d696b091c7044caed62605a7':
libhardware: boot_control: Clarify documentation for isSlotBootable().
David Zeuthen [Wed, 9 Dec 2015 15:07:02 +0000 (07:07 -0800)]
Merge "libhardware: boot_control: Clarify documentation for isSlotBootable()."
am:
f73b52393c
* commit '
f73b52393ca097292cb89c5c1052c36e98acbc03':
libhardware: boot_control: Clarify documentation for isSlotBootable().
David Zeuthen [Wed, 9 Dec 2015 15:01:18 +0000 (15:01 +0000)]
Merge "libhardware: boot_control: Clarify documentation for isSlotBootable()."
David Zeuthen [Tue, 8 Dec 2015 18:21:29 +0000 (13:21 -0500)]
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
Yin-Chia Yeh [Wed, 9 Dec 2015 01:45:15 +0000 (01:45 +0000)]
Merge "Camera: add HAL 3.4 declaration"
David Zeuthen [Tue, 8 Dec 2015 18:15:01 +0000 (13:15 -0500)]
libhardware: boot_control: Clarify documentation for isSlotBootable().
The documentation for this method is clearly wrong and it confused
several implementors.
Change-Id: I0427abcf87d0c8955ea1168513e6b9ab85380bf2
Yin-Chia Yeh [Tue, 8 Dec 2015 00:31:09 +0000 (16:31 -0800)]
Camera: add HAL 3.4 declaration
Bug:
26070606
Change-Id: I4768da5564eee28e24f8d7393e0544222675d833
Alexander Levitskiy [Fri, 4 Dec 2015 17:40:13 +0000 (17:40 +0000)]
Merge "Fingerprint: Change enumerate() to asynchronous mode."
Eino-Ville Talvala [Fri, 4 Dec 2015 00:32:29 +0000 (00:32 +0000)]
Merge "Camera: Mark camera HAL device v2.x as unsupported"
Ben Fennema [Wed, 2 Dec 2015 01:22:49 +0000 (01:22 +0000)]
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" am:
8b48359616 -s ours am:
500b648def -s ours am:
0a37154ad7 -s ours
am:
0716cc0e90 -s ours
* commit '
0716cc0e90824b050787e28bfda384f0603d8a9d':
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
Ben Fennema [Wed, 2 Dec 2015 01:19:35 +0000 (01:19 +0000)]
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" am:
8b48359616 -s ours am:
500b648def -s ours
am:
0a37154ad7 -s ours
* commit '
0a37154ad76fd59edbbe2a1249c95409f6425e71':
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
Ben Fennema [Wed, 2 Dec 2015 01:14:56 +0000 (01:14 +0000)]
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" am:
8b48359616 -s ours
am:
500b648def -s ours
* commit '
500b648def50f279431b2d79637f1ae4846dfa3d':
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
Ben Fennema [Wed, 2 Dec 2015 01:11:25 +0000 (01:11 +0000)]
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
am:
8b48359616 -s ours
* commit '
8b483596168805d95740b979d21098b25188b6da':
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
Ben Fennema [Wed, 2 Dec 2015 01:04:06 +0000 (01:04 +0000)]
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
This reverts commit
4c690fc64eba65e2a13ece82e6c81367a48a003a.
Change-Id: I1ebf4c866606e004e2120d106f32973700f8bfeb
Jani Suonpera [Wed, 2 Dec 2015 00:37:02 +0000 (00:37 +0000)]
DO NOT MERGE ANYWHERE Add new interface for sensor physical data am:
4c690fc64e -s ours am:
8e32a28508 -s ours am:
332241f214 -s ours
am:
2f711658c8 -s ours
* commit '
2f711658c8db4caf35354e7a2f6b5668f002c63f':
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
Jani Suonpera [Wed, 2 Dec 2015 00:33:40 +0000 (00:33 +0000)]
DO NOT MERGE ANYWHERE Add new interface for sensor physical data am:
4c690fc64e -s ours am:
8e32a28508 -s ours
am:
332241f214 -s ours
* commit '
332241f21446ebd4f0728c28c27882879c1dd6f8':
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
Jani Suonpera [Wed, 2 Dec 2015 00:29:39 +0000 (00:29 +0000)]
DO NOT MERGE ANYWHERE Add new interface for sensor physical data am:
4c690fc64e -s ours
am:
8e32a28508 -s ours
* commit '
8e32a28508f063354d9991d74070b257c870409b':
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
Jani Suonpera [Wed, 2 Dec 2015 00:25:42 +0000 (00:25 +0000)]
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
am:
4c690fc64e -s ours
* commit '
4c690fc64eba65e2a13ece82e6c81367a48a003a':
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
Jani Suonpera [Fri, 9 Oct 2015 09:00:40 +0000 (12:00 +0300)]
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
This is spesical solution only for emerald branch.
Changes including new const char* value/interface for sensor physical data. Sensor service and manager does not take care of content, structure or other
details of string. Sensor HAL is taking care of parsing data from string and setting values to Sensor HW.
Change-Id: Iae69e04b71313fbcba46515d6787f3deef4e7346
Signed-off-by: Ben Fennema <fennema@google.com>
Eino-Ville Talvala [Wed, 25 Nov 2015 21:51:51 +0000 (13:51 -0800)]
Camera: Mark camera HAL device v2.x as unsupported
Device HAL v2.x is obsolete, and no devices using it are still
supported. Mark it unsupported, and clean up native tests.
Bug:
25866588
Change-Id: I8e0f1448b8ae0eaaf3714f2351746af46c7657a7
Wonsik Kim [Thu, 26 Nov 2015 02:56:46 +0000 (11:56 +0900)]
tv_input: add signal detection flag to stream config
Bug:
23820259
Change-Id: I693f159b35192e14182cb3bc9082b2445c129560
Michael Wright [Wed, 25 Nov 2015 16:00:28 +0000 (16:00 +0000)]
Only log when actually receiving actual switch events.
Also, turn off debug logging in a couple other classes and fix an
incorrect format specifier.
Bug:
25497538
Change-Id: I72af9492415fa6910af90caf03a7884c6cb1a0b1
Michael Wright [Wed, 25 Nov 2015 16:00:28 +0000 (16:00 +0000)]
Only log when actually receiving actual switch events.
Also, turn off debug logging in a couple other classes and fix an
incorrect format specifier.
Bug:
25497538
Change-Id: I72af9492415fa6910af90caf03a7884c6cb1a0b1
Shawn Willden [Mon, 23 Nov 2015 16:36:47 +0000 (16:36 +0000)]
Merge "ECIES: adding ECIES-KEM" am:
3aa7935ef2 am:
7adb2d457c
am:
2eef78d355
* commit '
2eef78d355c62f3e1b5ec626a080a7e3f91257c9':
ECIES: adding ECIES-KEM
Shawn Willden [Mon, 23 Nov 2015 16:33:50 +0000 (16:33 +0000)]
Merge "ECIES: adding ECIES-KEM" am:
3aa7935ef2
am:
7adb2d457c
* commit '
7adb2d457c368a94c6a8e8b1e24926270421c5b8':
ECIES: adding ECIES-KEM
Shawn Willden [Mon, 23 Nov 2015 16:30:51 +0000 (16:30 +0000)]
Merge "ECIES: adding ECIES-KEM"
am:
3aa7935ef2
* commit '
3aa7935ef24946c1aa6db6c04fea10f39453c450':
ECIES: adding ECIES-KEM
Shawn Willden [Mon, 23 Nov 2015 16:27:03 +0000 (16:27 +0000)]
Merge "ECIES: adding ECIES-KEM"
Thai Duong [Fri, 3 Apr 2015 04:41:37 +0000 (21:41 -0700)]
ECIES: adding ECIES-KEM
Change-Id: Iea5877eba0a9b13610d3d1b33d04b5657edc3550
Rom Lemarchand [Thu, 19 Nov 2015 20:09:11 +0000 (20:09 +0000)]
boot: Add a boot_control HAL am:
e43c086ee1
am:
36741cc13c
* commit '
36741cc13cdbc08bccc92c0399a01982fb85f9dc':
boot: Add a boot_control HAL
Rom Lemarchand [Thu, 19 Nov 2015 19:59:29 +0000 (19:59 +0000)]
boot: Add a boot_control HAL
am:
e43c086ee1
* commit '
e43c086ee10af04c3e0027460d87408c496c7877':
boot: Add a boot_control HAL
Eino-Ville Talvala [Thu, 19 Nov 2015 03:02:32 +0000 (03:02 +0000)]
Merge "Camera: Fix Metadata static info intialization" am:
f7b855ac28
am:
297e586c29
* commit '
297e586c29489b5d43cddd9d9e4349f36f47166b':
Camera: Fix Metadata static info intialization
Colin Cross [Wed, 18 Nov 2015 17:55:23 +0000 (17:55 +0000)]
Merge "Vibrator: clarify the API" am:
8447aed332
am:
1dc2265379
* commit '
1dc2265379c7d0bb86f25b3b6bd345635728ea49':
Vibrator: clarify the API
Eino-Ville Talvala [Tue, 17 Nov 2015 23:39:13 +0000 (23:39 +0000)]
Merge "Camera: Fix Metadata static info intialization"
am:
f7b855ac28
* commit '
f7b855ac2813e5593db48ba9ba1002f3d56d38b8':
Camera: Fix Metadata static info intialization
Eino-Ville Talvala [Tue, 17 Nov 2015 23:34:40 +0000 (23:34 +0000)]
Merge "Camera: Fix Metadata static info intialization"
Colin Cross [Tue, 17 Nov 2015 19:53:02 +0000 (19:53 +0000)]
Merge "Vibrator: clarify the API"
am:
8447aed332
* commit '
8447aed33271c3f53849923327d6cfa3f4999e09':
Vibrator: clarify the API
Colin Cross [Tue, 17 Nov 2015 19:31:22 +0000 (19:31 +0000)]
Merge "Vibrator: clarify the API"
Jacopo Mondi [Tue, 18 Aug 2015 15:45:39 +0000 (17:45 +0200)]
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>
Rom Lemarchand [Fri, 14 Aug 2015 21:58:21 +0000 (14:58 -0700)]
boot: Add a boot_control HAL
The purpose of the boot control HAL is to communicate with the
bootloader and set various flags letting the bootloader know which
partition to boot
Change-Id: I15178abaaf9ca208b1e5300c9207cedbb7950a88
keunyoung [Fri, 13 Nov 2015 22:58:01 +0000 (14:58 -0800)]
fix build after merge
Change-Id: I6f5bcb6ac11c0726e312021146c9f378bc0010c5
Rakesh Iyer [Fri, 13 Nov 2015 21:15:06 +0000 (21:15 +0000)]
Merge "Add vehicle hal."
Sanket Agarwal [Tue, 11 Aug 2015 21:34:29 +0000 (14:34 -0700)]
Add vehicle hal.
- vehicle hal is used for supporting car specific features.
- Each property can be written (=set), read (=get), or subscribed.
- Each property has configuration informaiton to tell what that property
is and how it can be accessed.
- also adding dummy hal implementation.
bug:
25183740
Change-Id: Ib1cc1c11540f156db73552f2a18a8efb361002af
Hung-ying Tyan [Thu, 12 Nov 2015 03:19:45 +0000 (11:19 +0800)]
Add /odm/lib/hw to HAL search path
ODM HALs should be compiled into /odm/lib/hw on the ODM partition.
BUG:
25653199
Change-Id: I23324d8e4dc82301cebd71bc40cdd2b73a678360
Sanket Agarwal [Thu, 5 Nov 2015 21:20:25 +0000 (21:20 +0000)]
Merge "Add features for automotive usecases."
Sanket Agarwal [Thu, 8 Oct 2015 00:15:08 +0000 (17:15 -0700)]
Add features for automotive usecases.
1. Add clock to metadata - If the CAR does not have a clock (no network
or bad clock) then Radio RDS could be used as a proxy.
2. Add support for emergency announcement - If the CAR wants to make an
emergency announcement.
2.1 Add support for callbacks.
Bug: b/
24807501
Bug: b/
22701655
Change-Id: Ie5ada889bb6dfc4a2c1b02fc1db2d48d6899bcde
(cherry picked from commit
5768372922fbdfa47afef5bb414c69d606e7c1d2)
Sanket Agarwal [Wed, 28 Oct 2015 20:51:56 +0000 (13:51 -0700)]
Radio Hal tool to test HAL implementation.
A simple tool so that the HAL can be poked using a standalone binary.
Useful when changing the HAL and ensuring that HAL changes are
consistent with the required behavior.
Bug: b/
24807501
Bug: b/
22701655
Change-Id: I5aa3b614f83c0fd361787346a2c6d6c383fc8519
(cherry picked from commit
611bb7397be3fa341b3ef80f7a252850c68c2597)
Paul McLean [Tue, 3 Nov 2015 20:24:30 +0000 (12:24 -0800)]
USB MONOtization issue fix.
Fix problem with defaulting to MONO playback on USB devices that
report 1 & 2 channels.
Bug:
24366970
Change-Id: I6ee1376be998ad1aade66927bf64ff5a2518c0f4
Nicolas Capens [Tue, 3 Nov 2015 19:30:00 +0000 (19:30 +0000)]
Merge "Adjust gralloc to SwiftShader's requirements."
Sasha Levitskiy [Wed, 28 Oct 2015 20:58:44 +0000 (13:58 -0700)]
Fingerprint: Change enumerate() to asynchronous mode.
Bug:
25244240
Change-Id: If337241594b8c52737a14d476c1db96930b62a48
Aravind Akella [Wed, 14 Oct 2015 21:23:54 +0000 (21:23 +0000)]
am
87f61413: am
29b03118: am
1ce7fe6b: Merge "Fix DATA_INJECTION flag in sensors.h" into mnc-dr-dev
* commit '
87f6141397bb0e0c58926e365d9292f7951727f8':
Fix DATA_INJECTION flag in sensors.h
Aravind Akella [Wed, 14 Oct 2015 21:19:58 +0000 (21:19 +0000)]
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
Aravind Akella [Wed, 14 Oct 2015 21:08:12 +0000 (21:08 +0000)]
am
1ce7fe6b: Merge "Fix DATA_INJECTION flag in sensors.h" into mnc-dr-dev
* commit '
1ce7fe6b0a887edc6fad8e3386ab8e28a5f0d107':
Fix DATA_INJECTION flag in sensors.h
Aravind Akella [Wed, 14 Oct 2015 21:03:13 +0000 (21:03 +0000)]
Merge "Fix DATA_INJECTION flag in sensors.h" into mnc-dr-dev
Andy Hung [Wed, 14 Oct 2015 01:37:45 +0000 (01:37 +0000)]
am
f25c47fe: am
9a2f2ef1: am
419c27b9: Do not reset out_get_presentation_position() to 0 on standby
* commit '
f25c47fe39a2f1d28ad6b0fa5870a1aafe90878d':
Do not reset out_get_presentation_position() to 0 on standby
Andy Hung [Wed, 14 Oct 2015 01:28:33 +0000 (01:28 +0000)]
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
Andy Hung [Wed, 14 Oct 2015 01:18:31 +0000 (01:18 +0000)]
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
Andy Hung [Mon, 10 Aug 2015 20:52:34 +0000 (13:52 -0700)]
Do not reset out_get_presentation_position() to 0 on standby
Bug:
21199150
Bug:
23080499
Change-Id: I749b331bfce8cfe27b16bb2fce14f23816fb48ce
Nicolas Capens [Thu, 1 Oct 2015 19:51:34 +0000 (15:51 -0400)]
Adjust gralloc to SwiftShader's requirements.
SwiftShader processes 2x2 tiles of pixels simultaneously.
4 bytes of padding are required for reading 4-byte pixels in 8-byte chunks.
Change-Id: Ieb73df07859251cd0e5a649f9f3f16a318276e28
Michael Wright [Tue, 22 Sep 2015 20:05:51 +0000 (20:05 +0000)]
am
87dd6051: am
70097605: am
147d5404: Define the data parameter for POWER_HINT_INTERACTION.
* commit '
87dd60511708ce125efce3566a599518779d561b':
Define the data parameter for POWER_HINT_INTERACTION.
Michael Wright [Tue, 22 Sep 2015 18:35:25 +0000 (18:35 +0000)]
am
70097605: am
147d5404: Define the data parameter for POWER_HINT_INTERACTION.
* commit '
7009760593d457902fed7d90fe924cf20f3d0604':
Define the data parameter for POWER_HINT_INTERACTION.
Michael Wright [Tue, 22 Sep 2015 18:21:00 +0000 (18:21 +0000)]
am
147d5404: Define the data parameter for POWER_HINT_INTERACTION.
* commit '
147d5404f5958133c291cc26adb5a781d7ac2ea8':
Define the data parameter for POWER_HINT_INTERACTION.
Shawn Willden [Thu, 17 Sep 2015 00:58:22 +0000 (00:58 +0000)]
am
cd2fff40: am
94e514eb: am
e5a69c0d: Merge "Correct keymaster1 documentation."
* commit '
cd2fff40a9069dfcc49c7e70a994b513c16f32f2':
Correct keymaster1 documentation.
Shawn Willden [Thu, 17 Sep 2015 00:50:55 +0000 (00:50 +0000)]
am
94e514eb: am
e5a69c0d: Merge "Correct keymaster1 documentation."
* commit '
94e514eb78714edd9267822a00b688b52ceeceeb':
Correct keymaster1 documentation.
Shawn Willden [Thu, 17 Sep 2015 00:41:22 +0000 (00:41 +0000)]
am
e5a69c0d: Merge "Correct keymaster1 documentation."
* commit '
e5a69c0de7994a77653adda6a26f3e84f5bf81f4':
Correct keymaster1 documentation.
Shawn Willden [Thu, 17 Sep 2015 00:32:35 +0000 (00:32 +0000)]
Merge "Correct keymaster1 documentation."
Shawn Willden [Wed, 8 Jul 2015 15:57:16 +0000 (09:57 -0600)]
Correct keymaster1 documentation.
Bug:
22291207
Change-Id: Ib0b54d40d04ef3bb2fca6bf65d005b5432782482
Michael Wright [Wed, 16 Sep 2015 22:28:19 +0000 (23:28 +0100)]
Define the data parameter for POWER_HINT_INTERACTION.
Change-Id: I86857c1ea92082de109c612080e47c9c9835726b
Shawn Willden [Fri, 11 Sep 2015 23:10:38 +0000 (23:10 +0000)]
am
06926a57: am
1257a2aa: am
d527792f: Merge "Add KM_TAG_MIN_MAC_LENGTH."
* commit '
06926a5777f7948d094d9b96a306b28f3e570001':
Add KM_TAG_MIN_MAC_LENGTH.
Shawn Willden [Fri, 11 Sep 2015 23:04:52 +0000 (23:04 +0000)]
am
1257a2aa: am
d527792f: Merge "Add KM_TAG_MIN_MAC_LENGTH."
* commit '
1257a2aa9beefd7cd581ba69173890b07303ef8b':
Add KM_TAG_MIN_MAC_LENGTH.
Shawn Willden [Fri, 11 Sep 2015 21:46:33 +0000 (21:46 +0000)]
am
d527792f: Merge "Add KM_TAG_MIN_MAC_LENGTH."
* commit '
d527792f1fe9554add1fe7b1b17eb62ae9de4a43':
Add KM_TAG_MIN_MAC_LENGTH.
Aravind Akella [Thu, 10 Sep 2015 22:00:51 +0000 (15:00 -0700)]
Fix DATA_INJECTION flag in sensors.h
Bug:
24001171
Change-Id: Ia42934a97566f0ebe8d324e065351a3d9ed55621
Shawn Willden [Fri, 11 Sep 2015 13:21:16 +0000 (13:21 +0000)]
Merge "Add KM_TAG_MIN_MAC_LENGTH."
Shawn Willden [Wed, 8 Jul 2015 12:04:52 +0000 (06:04 -0600)]
Add KM_TAG_MIN_MAC_LENGTH.
This allows the binding of minimum length for MACs or tags to HMAC keys
and AEAD symmetric keys. Later attempts to use these keys with a
shorter MAC or tag specification (provided to begin() with
KM_TAG_MAC_LENGTH) will fail with KM_ERROR_INVALID_MAC_LENGTH.
Bug:
22337277
Change-Id: Ic5292ce01bdd6ecde25aad115e4b407aadc85f23
Dan Stoza [Fri, 4 Sep 2015 14:28:00 +0000 (14:28 +0000)]
am
fc0475db: am
5cdefc7b: am
95f01799: HWC: Add a color transform attribute per display
* commit '
fc0475db926b0ab5a621937ea563a4c40630a4d8':
HWC: Add a color transform attribute per display
Dan Stoza [Fri, 4 Sep 2015 02:21:33 +0000 (02:21 +0000)]
am
5cdefc7b: am
95f01799: HWC: Add a color transform attribute per display
* commit '
5cdefc7b6fedac0b84bf78aa8d695a7d34c042b1':
HWC: Add a color transform attribute per display
Dan Stoza [Thu, 3 Sep 2015 22:03:04 +0000 (22:03 +0000)]
am
95f01799: HWC: Add a color transform attribute per display
* commit '
95f017990ba70ba3ed22eac4f61c4f02cfc79045':
HWC: Add a color transform attribute per display
Dan Stoza [Mon, 31 Aug 2015 19:08:57 +0000 (12:08 -0700)]
HWC: Add a color transform attribute per display
Adds a color transform option to the queryable display attributes,
which allows a different vendor-specific color transform (e.g., wide
gamut, sRGB, etc.) per display configuration. This does not increase the
HWC version, and is considered a part of HWC 1.5, though if
getDisplayAttributes returns an error code as a result of being passed
an unsupported attribute, the call will be retried without the new color
transform option.
Bug:
20853317
Change-Id: Iab1605bc073ed4caa780e55ddf396efeeff3aff1
Daniel Rosenberg [Fri, 28 Aug 2015 21:43:56 +0000 (21:43 +0000)]
am
c3d6d3fa: am
92290228: am
fef6638e: Merge "boot: Add a boot_control HAL"
* commit '
c3d6d3fa75b32f3faae82930ebf425cfc4ed9084':
boot: Add a boot_control HAL
Daniel Rosenberg [Fri, 28 Aug 2015 21:29:30 +0000 (21:29 +0000)]
am
92290228: am
fef6638e: Merge "boot: Add a boot_control HAL"
* commit '
92290228f9254a2bf71172216d7f989becaad54d':
boot: Add a boot_control HAL
Daniel Rosenberg [Fri, 28 Aug 2015 21:24:51 +0000 (21:24 +0000)]
am
fef6638e: Merge "boot: Add a boot_control HAL"
* commit '
fef6638e82a8b3140f45e7ce410ad72609821142':
boot: Add a boot_control HAL
Daniel Rosenberg [Fri, 28 Aug 2015 21:17:42 +0000 (21:17 +0000)]
Merge "boot: Add a boot_control HAL"
Rom Lemarchand [Fri, 14 Aug 2015 21:58:21 +0000 (14:58 -0700)]
boot: Add a boot_control HAL
The purpose of the boot control HAL is to communicate with the
bootloader and set various flags letting the bootloader know which
partition to boot
Change-Id: I15178abaaf9ca208b1e5300c9207cedbb7950a88
Elliott Hughes [Thu, 27 Aug 2015 14:43:26 +0000 (14:43 +0000)]
am
b336cb04: am
e830df33: (-s ours) am
69164f04: Merge "Lose HAVE_ANDROID_OS from hardware/libhardware."
* commit '
b336cb0472ae2d48a19abb3ba153153c3ec7a1fa':
Glenn Kasten [Thu, 27 Aug 2015 14:43:25 +0000 (14:43 +0000)]
am
ab904ce5: am
3b78a249: (-s ours) am
569737c6: Merge "Add USB out_get_presentation_position() for timestamps" into mnc-dev
* commit '
ab904ce52661b63a29fc6be278a7cca5377cd796':
Ajay Panicker [Thu, 27 Aug 2015 14:43:25 +0000 (14:43 +0000)]
am
e03ef71c: am
ca76ccfa: (-s ours) am
b3759712: Implement Bluetooth settings factory reset (4/5)
* commit '
e03ef71c424bc2944640c8a703aa97dd8447d4ca':
Nick Vaccaro [Thu, 27 Aug 2015 14:43:24 +0000 (14:43 +0000)]
am
69607fb3: am
990d26fd: (-s ours) am
3f93d2a9: Merge "libhardware: sensors: update multi hal to support 64bit builds"
* commit '
69607fb3bc142248d21a09fa872e1f8f96371bea':
Jim Miller [Thu, 27 Aug 2015 14:43:23 +0000 (14:43 +0000)]
am
8225ff0f: am
948b99ed: (-s ours) am
929e0a19: Add better documentation to fingerprint.h
* commit '
8225ff0f0175668d4f9b3acb5ba20d3c39dc727c':
Shawn Willden [Thu, 27 Aug 2015 14:43:23 +0000 (14:43 +0000)]
am
52f7a8af: am
7ebe592c: (-s ours) am
70335f3d: Correct keymaster1 documentation.
* commit '
52f7a8af55e8e6264f12dd8a1c23dcc1eecacc83':
Alex Klyubin [Thu, 27 Aug 2015 14:43:22 +0000 (14:43 +0000)]
am
13bbf68a: am
ec585647: (-s ours) am
f9df59a7: Merge "Add KM_TAG_MIN_MAC_LENGTH." into mnc-dev
* commit '
13bbf68a7d2169473b9a47c3084e7d1325eb83d3':
Eino-Ville Talvala [Thu, 27 Aug 2015 14:43:21 +0000 (14:43 +0000)]
am
8ff07ad7: am
98115660: (-s ours) am
d95a340b: Merge "Camera2 tests: Fix incorrect error code check" into mnc-dev
* commit '
8ff07ad72ce6aeebd1bab6b89f4e4f0fc31407b7':
OSDN Git Service
