summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-12-09Merge "libhardware: boot_control: Add isSlotMarkedSuccesful() function."brillo-m8-releasebrillo-m8-devDavid Zeuthen
2015-12-09Merge "libhardware: boot_control: Clarify documentation for isSlotBootable()."David Zeuthen
2015-12-09libhardware: boot_control: Add isSlotMarkedSuccesful() function.David Zeuthen
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-08libhardware: boot_control: Clarify documentation for isSlotBootable().David Zeuthen
The documentation for this method is clearly wrong and it confused several implementors. Change-Id: I0427abcf87d0c8955ea1168513e6b9ab85380bf2
2015-11-23Merge "ECIES: adding ECIES-KEM"Shawn Willden
am: 3aa7935ef2 * commit '3aa7935ef24946c1aa6db6c04fea10f39453c450': ECIES: adding ECIES-KEM
2015-11-23Merge "ECIES: adding ECIES-KEM"Shawn Willden
2015-11-23ECIES: adding ECIES-KEMThai Duong
Change-Id: Iea5877eba0a9b13610d3d1b33d04b5657edc3550
2015-11-17Merge "Camera: Fix Metadata static info intialization"Eino-Ville Talvala
am: f7b855ac28 * commit 'f7b855ac2813e5593db48ba9ba1002f3d56d38b8': Camera: Fix Metadata static info intialization
2015-11-17Merge "Camera: Fix Metadata static info intialization"Eino-Ville Talvala
2015-11-17Merge "Vibrator: clarify the API"Colin Cross
am: 8447aed332 * commit '8447aed33271c3f53849923327d6cfa3f4999e09': Vibrator: clarify the API
2015-11-17Merge "Vibrator: clarify the API"Colin Cross
2015-11-17Camera: Fix Metadata static info intializationJacopo Mondi
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-10-14am 29b03118: am 1ce7fe6b: Merge "Fix DATA_INJECTION flag in sensors.h" into ↵Aravind Akella
mnc-dr-dev * commit '29b0311870b151fb93420ac0844b87855346a807': Fix DATA_INJECTION flag in sensors.h
2015-10-14am 1ce7fe6b: Merge "Fix DATA_INJECTION flag in sensors.h" into mnc-dr-devandroid-6.0.1_r45android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21marshmallow-dr1.5-releaseAravind Akella
* commit '1ce7fe6b0a887edc6fad8e3386ab8e28a5f0d107': Fix DATA_INJECTION flag in sensors.h
2015-10-14Merge "Fix DATA_INJECTION flag in sensors.h" into mnc-dr-devandroid-6.0.1_r9android-6.0.1_r8android-6.0.1_r7android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r20android-6.0.1_r17android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41marshmallow-mr1-devAravind Akella
2015-10-14am 9a2f2ef1: am 419c27b9: Do not reset out_get_presentation_position() to 0 ↵Andy Hung
on standby * commit '9a2f2ef14f6655cb4f71edca2553bbad3cc62795': Do not reset out_get_presentation_position() to 0 on standby
2015-10-14am 419c27b9: Do not reset out_get_presentation_position() to 0 on standbyAndy Hung
* commit '419c27b937b1628340985ac27f1d577e41b9a60e': Do not reset out_get_presentation_position() to 0 on standby
2015-10-13Do not reset out_get_presentation_position() to 0 on standbyAndy Hung
Bug: 21199150 Bug: 23080499 Change-Id: I749b331bfce8cfe27b16bb2fce14f23816fb48ce
2015-09-22am 70097605: am 147d5404: Define the data parameter for POWER_HINT_INTERACTION.Michael Wright
* commit '7009760593d457902fed7d90fe924cf20f3d0604': Define the data parameter for POWER_HINT_INTERACTION.
2015-09-22am 147d5404: Define the data parameter for POWER_HINT_INTERACTION.Michael Wright
* commit '147d5404f5958133c291cc26adb5a781d7ac2ea8': Define the data parameter for POWER_HINT_INTERACTION.
2015-09-17am 94e514eb: am e5a69c0d: Merge "Correct keymaster1 documentation."Shawn Willden
* commit '94e514eb78714edd9267822a00b688b52ceeceeb': Correct keymaster1 documentation.
2015-09-17am e5a69c0d: Merge "Correct keymaster1 documentation."brillo-m7-releasebrillo-m7-mr-devbrillo-m7-devShawn Willden
* commit 'e5a69c0de7994a77653adda6a26f3e84f5bf81f4': Correct keymaster1 documentation.
2015-09-17Merge "Correct keymaster1 documentation."Shawn Willden
2015-09-16Correct keymaster1 documentation.Shawn Willden
Bug: 22291207 Change-Id: Ib0b54d40d04ef3bb2fca6bf65d005b5432782482
2015-09-16Define the data parameter for POWER_HINT_INTERACTION.marshmallow-dr-devMichael Wright
Change-Id: I86857c1ea92082de109c612080e47c9c9835726b
2015-09-11am 1257a2aa: am d527792f: Merge "Add KM_TAG_MIN_MAC_LENGTH."Shawn Willden
* commit '1257a2aa9beefd7cd581ba69173890b07303ef8b': Add KM_TAG_MIN_MAC_LENGTH.
2015-09-11am d527792f: Merge "Add KM_TAG_MIN_MAC_LENGTH."Shawn Willden
* commit 'd527792f1fe9554add1fe7b1b17eb62ae9de4a43': Add KM_TAG_MIN_MAC_LENGTH.
2015-09-11Fix DATA_INJECTION flag in sensors.hAravind Akella
Bug: 24001171 Change-Id: Ia42934a97566f0ebe8d324e065351a3d9ed55621
2015-09-11Merge "Add KM_TAG_MIN_MAC_LENGTH."Shawn Willden
2015-09-10Add KM_TAG_MIN_MAC_LENGTH.Shawn Willden
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
2015-09-04am 5cdefc7b: am 95f01799: HWC: Add a color transform attribute per displayDan Stoza
* commit '5cdefc7b6fedac0b84bf78aa8d695a7d34c042b1': HWC: Add a color transform attribute per display
2015-09-03am 95f01799: HWC: Add a color transform attribute per displayDan Stoza
* commit '95f017990ba70ba3ed22eac4f61c4f02cfc79045': HWC: Add a color transform attribute per display
2015-08-31HWC: Add a color transform attribute per displayDan Stoza
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
2015-08-28am 92290228: am fef6638e: Merge "boot: Add a boot_control HAL"Daniel Rosenberg
* commit '92290228f9254a2bf71172216d7f989becaad54d': boot: Add a boot_control HAL
2015-08-28am fef6638e: Merge "boot: Add a boot_control HAL"Daniel Rosenberg
* commit 'fef6638e82a8b3140f45e7ce410ad72609821142': boot: Add a boot_control HAL
2015-08-28Merge "boot: Add a boot_control HAL"Daniel Rosenberg
2015-08-28boot: Add a boot_control HALRom Lemarchand
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
2015-08-27am e830df33: (-s ours) am 69164f04: Merge "Lose HAVE_ANDROID_OS from ↵Elliott Hughes
hardware/libhardware." * commit 'e830df33e9028e33137b425401e78d00e456aea2':
2015-08-27am 3b78a249: (-s ours) am 569737c6: Merge "Add USB ↵Glenn Kasten
out_get_presentation_position() for timestamps" into mnc-dev * commit '3b78a2497fef8d6620c64993eaf075b8c547c8de':
2015-08-27am ca76ccfa: (-s ours) am b3759712: Implement Bluetooth settings factory ↵Ajay Panicker
reset (4/5) * commit 'ca76ccfaa0176bad50771e14a1c417db77290654':
2015-08-27am 990d26fd: (-s ours) am 3f93d2a9: Merge "libhardware: sensors: update ↵Nick Vaccaro
multi hal to support 64bit builds" * commit '990d26fd3b669751e1820e9a505ed00ba76c1f33':
2015-08-27am 948b99ed: (-s ours) am 929e0a19: Add better documentation to fingerprint.hJim Miller
* commit '948b99ed9d7fdc45e9512d51667fb2b3c161608b':
2015-08-27am 7ebe592c: (-s ours) am 70335f3d: Correct keymaster1 documentation.Shawn Willden
* commit '7ebe592cb7e52e5b089dd27bedb68ee5dd91f6f8':
2015-08-27am ec585647: (-s ours) am f9df59a7: Merge "Add KM_TAG_MIN_MAC_LENGTH." into ↵Alex Klyubin
mnc-dev * commit 'ec58564768e4aebb71910ed6066ce523bc14991c':
2015-08-27am 98115660: (-s ours) am d95a340b: Merge "Camera2 tests: Fix incorrect ↵Eino-Ville Talvala
error code check" into mnc-dev * commit '9811566033a95fa9b92c500372642d108f9f8564':
2015-08-27am cdb4e7c0: (-s ours) am 49f58811: Remove out-of-date camera2 native tests.Ruben Brunk
* commit 'cdb4e7c0b0d1fcb96ecb4aa2d3858f1f1963f371':
2015-08-27am b43c4701: (-s ours) am 0a76e80b: Merge "Fix extern "C" guards."Shawn Willden
* commit 'b43c470125e783423e2a668aa9a203db3c52e7e4':
2015-08-13am 69164f04: Merge "Lose HAVE_ANDROID_OS from hardware/libhardware."Elliott Hughes
* commit '69164f045f62741460fcb4308025fcefa49fe38a': Lose HAVE_ANDROID_OS from hardware/libhardware.
2015-08-13am 69164f04: Merge "Lose HAVE_ANDROID_OS from hardware/libhardware."Elliott Hughes
* commit '69164f045f62741460fcb4308025fcefa49fe38a': Lose HAVE_ANDROID_OS from hardware/libhardware.
2015-08-12Merge "Lose HAVE_ANDROID_OS from hardware/libhardware."android-m-preview-2Elliott Hughes